diff --git a/charts/maas/templates/job-bootstrap-admin-user.yaml b/charts/maas/templates/job-bootstrap-admin-user.yaml
index 96ab659..aa222a3 100644
--- a/charts/maas/templates/job-bootstrap-admin-user.yaml
+++ b/charts/maas/templates/job-bootstrap-admin-user.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maas-bootstrap-admin-user
+  labels:
+{{ tuple $envAll "maas" "bootstrap-admin-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/maas/templates/job-db-init.yaml b/charts/maas/templates/job-db-init.yaml
index 08736f7..71044d2 100644
--- a/charts/maas/templates/job-db-init.yaml
+++ b/charts/maas/templates/job-db-init.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maas-db-init
+  labels:
+{{ tuple $envAll "maas" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/maas/templates/job-db-sync.yaml b/charts/maas/templates/job-db-sync.yaml
index 32c5220..6a50ba6 100644
--- a/charts/maas/templates/job-db-sync.yaml
+++ b/charts/maas/templates/job-db-sync.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maas-db-sync
+  labels:
+{{ tuple $envAll "maas" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/maas/templates/job-export-api-key.yaml b/charts/maas/templates/job-export-api-key.yaml
index eaf2a93..f2175e6 100644
--- a/charts/maas/templates/job-export-api-key.yaml
+++ b/charts/maas/templates/job-export-api-key.yaml
@@ -69,6 +69,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maas-export-api-key
+  labels:
+{{ tuple $envAll "maas" "export-api-key" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml
index f588d78..467a1c2 100644
--- a/charts/maas/templates/job-import.yaml
+++ b/charts/maas/templates/job-import.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maas-import-resources
+  labels:
+{{ tuple $envAll "maas" "import-resources" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 6f70744..dd093ed 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -18,7 +18,7 @@
 HELM=$1
 HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
 HTK_PATH=${HTK_PATH:-""}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"9797d1b034529c9739c19a30193c3605321fcf91"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"b1a247e7f54ab12d830ab74f7634457b4e43f3ef"}
 DEP_UP_LIST=${DEP_UP_LIST:-"maas"}
 
 if [[ ! -z $(echo $http_proxy) ]]