diff --git a/components/ambient-control-plane/internal/config/config.go b/components/ambient-control-plane/internal/config/config.go
index c69faa0f1..7a0f606d2 100644
--- a/components/ambient-control-plane/internal/config/config.go
+++ b/components/ambient-control-plane/internal/config/config.go
@@ -55,7 +55,7 @@ func Load() (*ControlPlaneConfig, error) {
 		Mode:                  envOrDefault("MODE", "kube"),
 		PlatformMode:          envOrDefault("PLATFORM_MODE", "standard"),
 		MPPConfigNamespace:    envOrDefault("MPP_CONFIG_NAMESPACE", "ambient-code--config"),
-		CPRuntimeNamespace:    envOrDefault("CP_RUNTIME_NAMESPACE", "ambient-code--runtime-int"),
+		CPRuntimeNamespace:    envOrDefault("CP_RUNTIME_NAMESPACE", envOrDefault("NAMESPACE", "ambient-code")),
 		OIDCTokenURL:          envOrDefault("OIDC_TOKEN_URL", "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token"),
 		OIDCClientID:          os.Getenv("OIDC_CLIENT_ID"),
 		OIDCClientSecret:      os.Getenv("OIDC_CLIENT_SECRET"),
diff --git a/components/manifests/base/ambient-control-plane-service.yml b/components/manifests/base/ambient-control-plane-service.yml
index 6ed2783c7..3799ed8dc 100644
--- a/components/manifests/base/ambient-control-plane-service.yml
+++ b/components/manifests/base/ambient-control-plane-service.yml
@@ -45,6 +45,10 @@ spec:
           value: "kube"
         - name: LOG_LEVEL
           value: "info"
+        - name: CP_RUNTIME_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         resources:
           requests:
             cpu: 50m