diff --git a/ci/temporal.jsonnet b/ci/temporal.jsonnet
index 33ad1156..89988e3b 100644
--- a/ci/temporal.jsonnet
+++ b/ci/temporal.jsonnet
@@ -6,7 +6,7 @@ local utils = import 'ci/utils.jsonnet';
     {
       name: '%s_TEMPORAL_HOSTPORT' % prefix,
       value: $.hostport,
-    }
+    },
     {
       name: 'TEMPORAL_NAMESPACE',
       value: if utils.helm_mode then '{{ .Values.temporalNamespace | default !"!" }}' else 'default',
diff --git a/peridot/cmd/v1/keykeeper/ci/deploy.jsonnet b/peridot/cmd/v1/keykeeper/ci/deploy.jsonnet
index e5394819..1332eb3c 100644
--- a/peridot/cmd/v1/keykeeper/ci/deploy.jsonnet
+++ b/peridot/cmd/v1/keykeeper/ci/deploy.jsonnet
@@ -81,7 +81,6 @@ bycdeploy.new({
       name: 'KEYKEEPER_S3_BUCKET',
       value: 'resf-peridot-prod',
     },
-    temporal.kube_env('KEYKEEPER'),
     $.dsn,
-  ],
+  ] + temporal.kube_env('KEYKEEPER'),
 })
diff --git a/peridot/cmd/v1/peridotephemeral/ci/deploy.jsonnet b/peridot/cmd/v1/peridotephemeral/ci/deploy.jsonnet
index d4ed0c56..7f6ef012 100644
--- a/peridot/cmd/v1/peridotephemeral/ci/deploy.jsonnet
+++ b/peridot/cmd/v1/peridotephemeral/ci/deploy.jsonnet
@@ -107,10 +107,6 @@ bycdeploy.new({
       name: 'YUMREPOFS_HTTP_ENDPOINT_OVERRIDE',
       value: 'https://yumrepofs.build.resf.org',
     },
-    if site == 'extarches' then {
-      name: 'PERIDOTEPHEMERAL_TEMPORAL_HOSTPORT',
-      value: 'temporal.corp.build.resf.org:443',
-    } else temporal.kube_env('PERIDOTEPHEMERAL'),
     if site == 'extarches' then {
       name: 'PERIDOTEPHEMERAL_PROVISION_ONLY',
       value: 'true',
@@ -136,7 +132,16 @@ bycdeploy.new({
       },
     },
     $.dsn,
-  ],
+  ] + if site == 'extarches' then [
+    {
+      name: 'PERIDOTEPHEMERAL_TEMPORAL_HOSTPORT',
+      value: 'temporal.corp.build.resf.org:443',
+    },
+    {
+      name: 'TEMPORAL_NAMESPACE',
+      value: 'default',
+    },
+  ] else temporal.kube_env('PERIDOTEPHEMERAL'),
   custom_job_items(metadata, extra): [
     provisionWorkerRole(metadata),
     kubernetes.bind_to_role_sa(provisionWorkerRole(metadata), extra.service_account_name)
diff --git a/peridot/cmd/v1/peridotserver/ci/deploy.jsonnet b/peridot/cmd/v1/peridotserver/ci/deploy.jsonnet
index 1feaf7dc..681384ab 100644
--- a/peridot/cmd/v1/peridotserver/ci/deploy.jsonnet
+++ b/peridot/cmd/v1/peridotserver/ci/deploy.jsonnet
@@ -50,7 +50,6 @@ bycdeploy.new({
       name: 'PERIDOT_PRODUCTION',
       value: if kubernetes.dev() then 'false' else 'true',
     },
-    temporal.kube_env('PERIDOT'),
     $.dsn,
-  ],
+  ] + temporal.kube_env('PERIDOT'),
 })
diff --git a/peridot/cmd/v1/yumrepofsupdater/ci/deploy.jsonnet b/peridot/cmd/v1/yumrepofsupdater/ci/deploy.jsonnet
index e9ad074e..e67a73e7 100644
--- a/peridot/cmd/v1/yumrepofsupdater/ci/deploy.jsonnet
+++ b/peridot/cmd/v1/yumrepofsupdater/ci/deploy.jsonnet
@@ -68,7 +68,6 @@ bycdeploy.new({
       name: 'YUMREPOFSUPDATER_S3_BUCKET',
       value: 'resf-peridot-prod',
     },
-    temporal.kube_env('YUMREPOFSUPDATER'),
     $.dsn,
-  ],
+  ] + temporal.kube_env('YUMREPOFSUPDATER'),
 })