diff --git a/apps/base/customer1/trading-platform/configmaps/execute-service-config.yaml b/apps/base/customer1/trading-platform/configmaps/execute-service-config.yaml
index 090157f..c04826f 100644
--- a/apps/base/customer1/trading-platform/configmaps/execute-service-config.yaml
+++ b/apps/base/customer1/trading-platform/configmaps/execute-service-config.yaml
@@ -4,10 +4,10 @@ metadata:
   name: trading-execute-service-config
   namespace: customer1
 data:
-  DB_HOST: "hermes-pgdb-rw.customer1.svc.cluster.local"
-  DB_PORT: "5432"
-  DB_NAME: "trading_data"
-  REDIS_HOST: "trading-redis.customer1.svc.cluster.local"
-  REDIS_PORT: "6379"
-  KAFKA_BROKER: "trading-kafka.customer1.svc.cluster.local:9092"
-  LOG_LEVEL: "info"
+  EXECUTE_DB_HOST: "hermes-pgdb-rw.customer1.svc.cluster.local"
+  EXECUTE_DB_PORT: "5432"
+  EXECUTE_DB_NAME: "trading_data"
+  EXECUTE_REDIS_HOST: "trading-redis.customer1.svc.cluster.local"
+  EXECUTE_REDIS_PORT: "6379"
+  EXECUTE_KAFKA_BOOTSTRAP_SERVERS: "trading-kafka.customer1.svc.cluster.local:9092"
+  EXECUTE_LOG_LEVEL: "info"
diff --git a/apps/base/customer1/trading-platform/execute-service/deployment.yaml b/apps/base/customer1/trading-platform/execute-service/deployment.yaml
index 2881071..1eed507 100644
--- a/apps/base/customer1/trading-platform/execute-service/deployment.yaml
+++ b/apps/base/customer1/trading-platform/execute-service/deployment.yaml
@@ -48,12 +48,12 @@ spec:
             - configMapRef:
                 name: trading-execute-service-config
           env:
-            - name: DB_USER
+            - name: EXECUTE_DB_USER
               valueFrom:
                 secretKeyRef:
                   name: trading-db-credentials
                   key: username
-            - name: DB_PASSWORD
+            - name: EXECUTE_DB_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: trading-db-credentials
diff --git a/trading-platform/deploy/k8s/base/execute-service-deployment.yaml b/trading-platform/deploy/k8s/base/execute-service-deployment.yaml
index c0d8e8e..3004f49 100644
--- a/trading-platform/deploy/k8s/base/execute-service-deployment.yaml
+++ b/trading-platform/deploy/k8s/base/execute-service-deployment.yaml
@@ -34,6 +34,17 @@ spec:
           envFrom:
             - configMapRef:
                 name: trading-platform-config
+          env:
+            - name: EXECUTE_DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: trading-db-credentials
+                  key: username
+            - name: EXECUTE_DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: trading-db-credentials
+                  key: password
           resources:
             limits:
               cpu: "500m"
diff --git a/trading-platform/helm/trading-platform/templates/configmap.yaml b/trading-platform/helm/trading-platform/templates/configmap.yaml
index 25f31ee..20d7b05 100644
--- a/trading-platform/helm/trading-platform/templates/configmap.yaml
+++ b/trading-platform/helm/trading-platform/templates/configmap.yaml
@@ -16,7 +16,11 @@ data:
   # Redis connection
   REDIS_HOST: redis-master.{{ .Values.global.namespace }}.svc.cluster.local
   REDIS_PORT: "6379"
-  # PostgreSQL connection
+  # PostgreSQL connection (execute-service uses EXECUTE_ prefix)
+  EXECUTE_DB_HOST: postgres-primary.{{ .Values.global.namespace }}.svc.cluster.local
+  EXECUTE_DB_PORT: "5432"
+  EXECUTE_DB_NAME: "trading_data"
+  # Legacy keys (other services)
   POSTGRES_HOST: postgres-primary.{{ .Values.global.namespace }}.svc.cluster.local
   POSTGRES_PORT: "5432"
   # Solana RPC (ExternalName service)