diff --git a/k8s/base/kustomization.yml b/k8s/base/kustomization.yml
index 548aafe3..1e9300a7 100644
--- a/k8s/base/kustomization.yml
+++ b/k8s/base/kustomization.yml
@@ -1,5 +1,7 @@
 resources:
-  - app.yml
-  - app-redis.yml
-  - app-worker-beat.yml
-  - app-worker.yml
+- app.yml
+- app-redis.yml
+- app-worker-beat.yml
+- app-worker.yml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/k8s/dev/kustomization.yml b/k8s/dev/kustomization.yml
index 28f7be67..427ba7ac 100644
--- a/k8s/dev/kustomization.yml
+++ b/k8s/dev/kustomization.yml
@@ -1,5 +1,5 @@
 resources:
-  - ../base
+- ../base
 nameSuffix: -dev
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -8,63 +8,63 @@ labels:
   pairs:
     app: stormpiper-dev
 images:
-  - name: gcr.io/tacoma-app/stormpiper-pod
-    newName: gcr.io/tacoma-app/stormpiper-pod
-    newTag: edge
-  - name: gcr.io/tacoma-app/bg_worker
-    newName: gcr.io/tacoma-app/bg_worker
-    newTag: edge
-  - name: gcr.io/tacoma-app/redis
-    newName: gcr.io/tacoma-app/redis
-    newTag: edge
+- name: gcr.io/tacoma-app/stormpiper-pod
+  newName: gcr.io/tacoma-app/stormpiper-pod
+  newTag: edge
+- name: gcr.io/tacoma-app/bg_worker
+  newName: gcr.io/tacoma-app/bg_worker
+  newTag: edge
+- name: gcr.io/tacoma-app/redis
+  newName: gcr.io/tacoma-app/redis
+  newTag: edge
 patches:
-  - path: secrets.yml
-    target:
-      group: apps
-      kind: Deployment
-      name: stormpiper
-      version: v1
-  - path: secrets.yml
-    target:
-      group: apps
-      kind: Deployment
-      name: worker
-      version: v1
-  - path: secrets.yml
-    target:
-      group: apps
-      kind: Deployment
-      name: beat
-      version: v1
-  - target:
-      version: v1
-      kind: VerticalPodAutoscaler
-      name: redis
-    patch: |-
-      - op: replace
-        path: /spec/targetRef/name
-        value: redis-dev
-  - target:
-      version: v1
-      kind: VerticalPodAutoscaler
-      name: beat
-    patch: |-
-      - op: replace
-        path: /spec/targetRef/name
-        value: beat-dev
-  - target:
-      version: v1
-      kind: VerticalPodAutoscaler
-      name: worker
-    patch: |-
-      - op: replace
-        path: /spec/targetRef/name
-        value: worker-dev
-  - target:
-      version: v1
-      kind: VerticalPodAutoscaler
-      name: stormpiper
-    patch: |-
-      - op: replace
-        path: /spec/targetRef/name
-        value: stormpiper-dev
+- path: secrets.yml
+  target:
+    group: apps
+    kind: Deployment
+    name: stormpiper
+    version: v1
+- path: secrets.yml
+  target:
+    group: apps
+    kind: Deployment
+    name: worker
+    version: v1
+- path: secrets.yml
+  target:
+    group: apps
+    kind: Deployment
+    name: beat
+    version: v1
+- patch: |-
+    - op: replace
+      path: /spec/targetRef/name
+      value: redis-dev
+  target:
+    kind: VerticalPodAutoscaler
+    name: redis
+    version: v1
+- patch: |-
+    - op: replace
+      path: /spec/targetRef/name
+      value: beat-dev
+  target:
+    kind: VerticalPodAutoscaler
+    name: beat
+    version: v1
+- patch: |-
+    - op: replace
+      path: /spec/targetRef/name
+      value: worker-dev
+  target:
+    kind: VerticalPodAutoscaler
+    name: worker
+    version: v1
+- patch: |-
+    - op: replace
+      path: /spec/targetRef/name
+      value: stormpiper-dev
+  target:
+    kind: VerticalPodAutoscaler
+    name: stormpiper
+    version: v1
diff --git a/k8s/ingress/kustomization.yml b/k8s/ingress/kustomization.yml
index 774eba53..f374c482 100644
--- a/k8s/ingress/kustomization.yml
+++ b/k8s/ingress/kustomization.yml
@@ -1,3 +1,4 @@
 resources:
-  - gke_ingress.yml
-
+- gke_ingress.yml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/k8s/prod/kustomization.yml b/k8s/prod/kustomization.yml
index dbacd53f..d01ec668 100644
--- a/k8s/prod/kustomization.yml
+++ b/k8s/prod/kustomization.yml
@@ -1,15 +1,21 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ../base
+- ../base
+
 nameSuffix: -prod
-commonLabels:
-  app: stormpiper-prod
+
+labels:
+- includeSelectors: true
+  pairs:
+    app: stormpiper-prod
 images:
-  - name: gcr.io/tacoma-app/stormpiper-pod
-    newName: gcr.io/tacoma-app/stormpiper-pod
-    newTag: latest
-  - name: gcr.io/tacoma-app/bg_worker
-    newName: gcr.io/tacoma-app/bg_worker
-    newTag: latest
-  - name: gcr.io/tacoma-app/redis
-    newName: gcr.io/tacoma-app/redis
-    newTag: latest
+- name: gcr.io/tacoma-app/stormpiper-pod
+  newName: gcr.io/tacoma-app/stormpiper-pod
+  newTag: latest
+- name: gcr.io/tacoma-app/bg_worker
+  newName: gcr.io/tacoma-app/bg_worker
+  newTag: latest
+- name: gcr.io/tacoma-app/redis
+  newName: gcr.io/tacoma-app/redis
+  newTag: latest
diff --git a/k8s/release/kustomization.yml b/k8s/release/kustomization.yml
index ab9162b7..4b407db2 100644
--- a/k8s/release/kustomization.yml
+++ b/k8s/release/kustomization.yml
@@ -1,4 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - ../prod
-  - ../dev
-  - ../ingress
+- ../prod
+- ../dev
+- ../ingress