diff --git a/k8s/base/api.yaml b/k8s/base/api.yaml
index 62f3f51e..76907574 100644
--- a/k8s/base/api.yaml
+++ b/k8s/base/api.yaml
@@ -23,9 +23,9 @@ spec:
             - containerPort: 7456
           env:
             - name: PG_HOST
-              value: "$(PG_HOST)"
+              value: ""
             - name: REDIS_HOST
-              value: "$(REDIS_HOST)"
+              value: ""
       restartPolicy: Always
 
 
diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml
index fb61a168..789822a3 100644
--- a/k8s/base/kustomization.yaml
+++ b/k8s/base/kustomization.yaml
@@ -5,12 +5,4 @@ resources:
 
 
 
-vars:
-  - name: PG_HOST
-    objref:
-      kind: Service
-      name: pg
-  - name: REDIS_HOST
-    objref:
-      kind: Service
-      name: redis
+
diff --git a/k8s/master/kustomization.yaml b/k8s/master/kustomization.yaml
index d5ef87ce..594e0197 100644
--- a/k8s/master/kustomization.yaml
+++ b/k8s/master/kustomization.yaml
@@ -15,3 +15,24 @@ images:
 commonLabels:
   branch: master
 nameSuffix: -master
+
+
+replacements:
+  - source:
+      kind: Service
+      name: pg-master
+    targets:
+      - select:
+          kind: Deployment
+          name: coal-api
+        fieldPaths:
+          - spec.template.spec.containers.[name=coal-api].env.[name=PG_HOST].value
+  - source:
+      kind: Service
+      name: redis-master
+    targets:
+      - select:
+          kind: Deployment
+          name: coal-api
+        fieldPaths:
+          - spec.template.spec.containers.[name=coal-api].env.[name=REDIS_HOST].value
diff --git a/k8s/prod/kustomization.yaml b/k8s/prod/kustomization.yaml
index a4df1e1b..be829fa7 100644
--- a/k8s/prod/kustomization.yaml
+++ b/k8s/prod/kustomization.yaml
@@ -15,3 +15,24 @@ images:
 commonLabels:
   branch: prod
 nameSuffix: -prod
+
+
+replacements:
+  - source:
+      kind: Service
+      name: pg-prod
+    targets:
+      - select:
+          kind: Deployment
+          name: coal-api
+        fieldPaths:
+          - spec.template.spec.containers.[name=coal-api].env.[name=PG_HOST].value
+  - source:
+      kind: Service
+      name: redis-prod
+    targets:
+      - select:
+          kind: Deployment
+          name: coal-api
+        fieldPaths:
+          - spec.template.spec.containers.[name=coal-api].env.[name=REDIS_HOST].value
diff --git a/k8s/test/kustomization.yaml b/k8s/test/kustomization.yaml
index d38e4f70..fe2faf70 100644
--- a/k8s/test/kustomization.yaml
+++ b/k8s/test/kustomization.yaml
@@ -15,3 +15,24 @@ images:
 commonLabels:
   branch: test
 nameSuffix: -test
+
+
+replacements:
+  - source:
+      kind: Service
+      name: pg-test
+    targets:
+      - select:
+          kind: Deployment
+          name: coal-api
+        fieldPaths:
+          - spec.template.spec.containers.[name=coal-api].env.[name=PG_HOST].value
+  - source:
+      kind: Service
+      name: redis-test
+    targets:
+      - select:
+          kind: Deployment
+          name: coal-api
+        fieldPaths:
+          - spec.template.spec.containers.[name=coal-api].env.[name=REDIS_HOST].value
diff --git a/kustomize.exe b/kustomize.exe
new file mode 100644
index 00000000..f7eddf51
Binary files /dev/null and b/kustomize.exe differ