diff --git a/contrib/docker-ckan/dev.env.template b/contrib/docker-ckan/dev.env.template
index f8cfa9186..6d8dd71e8 100644
--- a/contrib/docker-ckan/dev.env.template
+++ b/contrib/docker-ckan/dev.env.template
@@ -52,6 +52,7 @@ CKAN_SMDH__AWS_ACCOUNT_ID=
 CKAN_SMDH__AWS_ACCESS_KEY_ID=
 CKAN_SMDH__AWS_SECRET_ACCESS_KEY=
 CKAN_SMDH__AWS_STORAGE_BUCKET_NAME=
+CKAN_SMDH__AWS_STORAGE_BUCKET_REGION=
 
 # Solr
 SOLR_IMAGE_VERSION=2.9-solr8
diff --git a/contrib/docker-ckan/docker-compose.dev.yml b/contrib/docker-ckan/docker-compose.dev.yml
index 295313908..840ace349 100644
--- a/contrib/docker-ckan/docker-compose.dev.yml
+++ b/contrib/docker-ckan/docker-compose.dev.yml
@@ -31,7 +31,14 @@ services:
       - ./src:/srv/app/src_extensions
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
+      test:
+        [
+          "CMD",
+          "wget",
+          "-qO",
+          "/dev/null",
+          "http://localhost:${CKAN_PORT}/api/3/action/status_show",
+        ]
 
   ckan-dev-worker:
     <<: *ckan
diff --git a/contrib/docker-ckan/docker-compose.prod.yml b/contrib/docker-ckan/docker-compose.prod.yml
index 2825fa294..b6c6b187c 100644
--- a/contrib/docker-ckan/docker-compose.prod.yml
+++ b/contrib/docker-ckan/docker-compose.prod.yml
@@ -23,6 +23,12 @@ x-aws-cloudformation:
 
 services:
   ckan:
+    ports:
+      # use NGINX port mapping here so that the target group CkanTCP80TargetGroup
+      # is correctly configured to point to the right ports. We later inject the
+      # NGINX sidecar and replace this port to point to CKAN's port, and also point
+      # the target group to the injected NGINX container instead.
+      - "${NGINX_PORT_HOST}:${NGINX_PORT}"
     x-aws-role: &ckan-role
       Version: "2012-10-17"
       Statement:
diff --git a/contrib/docker-ckan/docker-compose.yml b/contrib/docker-ckan/docker-compose.yml
index d42eced55..ae7b442ef 100755
--- a/contrib/docker-ckan/docker-compose.yml
+++ b/contrib/docker-ckan/docker-compose.yml
@@ -46,10 +46,15 @@ services:
         condition: service_healthy
     volumes:
       - ckan_storage:/var/lib/ckan
-    ports:
-      - "${NGINX_PORT_HOST}:${NGINX_PORT}"
     healthcheck:
-      test: ["CMD", "wget", "-qO", "/dev/null", "${CKAN_SITE_URL}/api/3/action/status_show"]
+      test:
+        [
+          "CMD",
+          "wget",
+          "-qO",
+          "/dev/null",
+          "http://localhost:${CKAN_PORT}/api/3/action/status_show",
+        ]
 
   ckan-worker:
     <<: *ckan