diff --git a/src/runboat/kubefiles/kustomization.yaml.jinja b/src/runboat/kubefiles/kustomization.yaml.jinja
index aa78542..0cdac10 100644
--- a/src/runboat/kubefiles/kustomization.yaml.jinja
+++ b/src/runboat/kubefiles/kustomization.yaml.jinja
@@ -16,8 +16,11 @@ namespace: {{ namespace }}
 
 namePrefix: "{{ build_name }}-"
 
-commonLabels:
-  runboat/build: "{{ build_name }}"
+labels:
+  - pairs:
+      runboat/build: "{{ build_name }}"
+    includeSelectors: true
+    includeTemplates: true
 
 commonAnnotations:
   runboat/repo: "{{ commit_info.repo }}"
diff --git a/tests/test_render_kubefiles.py b/tests/test_render_kubefiles.py
index f3642ae..07e90a1 100644
--- a/tests/test_render_kubefiles.py
+++ b/tests/test_render_kubefiles.py
@@ -14,8 +14,11 @@ namespace: runboat-builds
 
 namePrefix: "build-name-"
 
-commonLabels:
-  runboat/build: "build-name"
+labels:
+  - pairs:
+      runboat/build: "build-name"
+    includeSelectors: true
+    includeTemplates: true
 
 commonAnnotations:
   runboat/repo: "oca/mis-builder"