diff --git a/docker/profiles/docker-compose.actions.yml b/docker/profiles/docker-compose.actions.yml
index 54119f65d5..ef3e17ae76 100644
--- a/docker/profiles/docker-compose.actions.yml
+++ b/docker/profiles/docker-compose.actions.yml
@@ -60,10 +60,16 @@ services:
     profiles:
       - debug
       - debug-backend
-      - debug-backend-aws
     depends_on:
       datahub-gms-debug:
         condition: service_healthy
+  datahub-actions-debug-aws:
+    <<: *datahub-actions-service-dev
+    profiles:
+      - debug-backend-aws
+    depends_on:
+      datahub-gms-debug-aws:
+        condition: service_healthy
   datahub-actions-debug-postgres:
     <<: *datahub-actions-service-dev
     profiles:
diff --git a/docker/profiles/docker-compose.gms.yml b/docker/profiles/docker-compose.gms.yml
index 4391dff7bb..09c77c1c6d 100644
--- a/docker/profiles/docker-compose.gms.yml
+++ b/docker/profiles/docker-compose.gms.yml
@@ -137,10 +137,6 @@ x-datahub-gms-service-dev: &datahub-gms-service-dev
     LINEAGE_SEARCH_CACHE_ENABLED: false
     SHOW_BROWSE_V2: true
     ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
-    AWS_ENDPOINT_URL: ${DATAHUB_AWS_ENDPOINT_URL:-http://localstack:4566}
-    AWS_ACCESS_KEY_ID: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
-    AWS_SECRET_ACCESS_KEY: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
-    AWS_REGION: ${DATAHUB_AWS_REGION:-us-east-1}
   volumes:
     - ./datahub-gms/start.sh:/datahub/datahub-gms/scripts/start.sh
     - ./monitoring/client-prometheus-config.yaml:/datahub/datahub-gms/scripts/prometheus-config.yaml
@@ -370,7 +366,19 @@ services:
     profiles:
       - debug
       - debug-backend
+    depends_on:
+      system-update-debug:
+        condition: service_completed_successfully
+  datahub-gms-debug-aws:
+    <<: *datahub-gms-service-dev
+    profiles:
       - debug-backend-aws
+    environment:
+      <<: *datahub-gms-dev-env
+      AWS_ENDPOINT_URL: ${DATAHUB_AWS_ENDPOINT_URL:-http://localstack:4566}
+      AWS_ACCESS_KEY_ID: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
+      AWS_SECRET_ACCESS_KEY: ${DATAHUB_AWS_ACCESS_KEY_ID:-test}
+      AWS_REGION: ${DATAHUB_AWS_REGION:-us-east-1}
     depends_on:
       system-update-debug:
         condition: service_completed_successfully