diff --git a/app.py b/app.py
index 8cac9f6..2fc181b 100644
--- a/app.py
+++ b/app.py
@@ -135,7 +135,6 @@
         "SERVER_PORT": "8081",
         "DEFAULT_ZONE": "http://localhost:8081/eureka",
         "SPRING_CLOUD_CONFIG_URI": "http://openchallenges-config-server:8090",
-        "OPENCHALLENGES_SERVICE_REGISTRY_IS_DEPLOYED_ON_AWS": "true",
     },
 )
 
@@ -204,6 +203,7 @@
         "DB_SUBMISSION_TYPES_CSV_PATH": "/workspace/BOOT-INF/classes/db/submission_types.csv",
         "DB_CATEGORIES_CSV_PATH": "/workspace/BOOT-INF/classes/db/categories.csv",
         "DB_EDAM_CONCEPT_CSV_PATH": "/workspace/BOOT-INF/classes/db/edam_concept.csv",
+        "OPENCHALLENGES_CHALLENGE_SERVICE_IS_DEPLOYED_ON_AWS": "true",
     },
 )
 
@@ -235,6 +235,7 @@
         "DB_URL": "jdbc:mysql://openchallenges-mariadb:3306/organization_service?allowLoadLocalInfile=true",
         "DB_ORGANIZATIONS_CSV_PATH": "/workspace/BOOT-INF/classes/db/organizations.csv",
         "DB_CONTRIBUTION_ROLES_CSV_PATH": "/workspace/BOOT-INF/classes/db/contribution_roles.csv",
+        "OPENCHALLENGES_ORGANIZATION_SERVICE_IS_DEPLOYED_ON_AWS": "true",
     },
 )