diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7e249cbf..10c0da26 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,6 +27,18 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.ECR_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+        with:
+          mask-password: 'true'
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
diff --git a/docker/docker-compose.cht-core.yml b/docker/docker-compose.cht-core.yml
index d13c53cc..236ec544 100644
--- a/docker/docker-compose.cht-core.yml
+++ b/docker/docker-compose.cht-core.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   haproxy:
-    image: public.ecr.aws/medic/cht-haproxy:4.1.0-alpha
+    image: 720541322708.dkr.ecr.eu-west-2.amazonaws.com/medic/cht-haproxy:4.1.0-alpha
     restart: always
     hostname: haproxy
     environment:
@@ -26,7 +26,7 @@ services:
 
 
   healthcheck:
-    image: public.ecr.aws/medic/cht-haproxy-healthcheck:4.1.0-alpha
+    image: 720541322708.dkr.ecr.eu-west-2.amazonaws.com/medic/cht-haproxy-healthcheck:4.1.0-alpha
     restart: always
     environment:
       - "COUCHDB_SERVERS=${COUCHDB_SERVERS:-couchdb}"
@@ -41,7 +41,7 @@ services:
       - cht-net
 
   api:
-    image: public.ecr.aws/medic/cht-api:4.1.0-alpha
+    image: 720541322708.dkr.ecr.eu-west-2.amazonaws.com/medic/cht-api:4.1.0-alpha
     restart: always
     depends_on:
       - haproxy
@@ -62,7 +62,7 @@ services:
       - cht-net
 
   sentinel:
-    image: public.ecr.aws/medic/cht-sentinel:4.1.0-alpha
+    image: 720541322708.dkr.ecr.eu-west-2.amazonaws.com/medic/cht-sentinel:4.1.0-alpha
     restart: always
     depends_on:
       - haproxy
@@ -78,7 +78,7 @@ services:
       - cht-net
 
   nginx:
-    image: public.ecr.aws/medic/cht-nginx:4.1.0-alpha
+    image: 720541322708.dkr.ecr.eu-west-2.amazonaws.com/medic/cht-nginx:4.1.0-alpha
     restart: always
     depends_on:
       - api