diff --git a/divingbell/templates/daemonset-ethtool.yaml b/divingbell/templates/daemonset-ethtool.yaml
index 0f2e3d3..3f21328 100644
--- a/divingbell/templates/daemonset-ethtool.yaml
+++ b/divingbell/templates/daemonset-ethtool.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/divingbell/templates/daemonset-mounts.yaml b/divingbell/templates/daemonset-mounts.yaml
index e1665cc..fb4fc19 100644
--- a/divingbell/templates/daemonset-mounts.yaml
+++ b/divingbell/templates/daemonset-mounts.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/divingbell/templates/daemonset-sysctl.yaml b/divingbell/templates/daemonset-sysctl.yaml
index a4e9d49..b869935 100644
--- a/divingbell/templates/daemonset-sysctl.yaml
+++ b/divingbell/templates/daemonset-sysctl.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/divingbell/templates/daemonset-uamlite.yaml b/divingbell/templates/daemonset-uamlite.yaml
index 3b6953e..460cd10 100644
--- a/divingbell/templates/daemonset-uamlite.yaml
+++ b/divingbell/templates/daemonset-uamlite.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 6eabfc6..1b49098 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -16,7 +16,7 @@
 # Script to setup helm-toolkit and helm dep up the shipyard chart
 #
 HELM=$1
-HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm"}
+HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
 HTK_PATH=${HTK_PATH:-""}
 DEP_UP_LIST=${DEP_UP_LIST:-"divingbell"}