diff --git a/.zuul.yaml b/.zuul.yaml
index e144d783..6ceadf44 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -169,6 +169,8 @@
     timeout: 900
     run: tools/gate/playbooks/build-charts.yaml
     nodeset: deckhand-single-node-focal
+    vars:
+      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
 
 - job:
     name: deckhand-chart-build-latest-htk
@@ -235,8 +237,11 @@
       - airship/treasuremap
     vars:
       CLONE_DECKHAND: false
-      OSH_INFRA_COMMIT: 443ff3e3e340c94c5cbb214d1e2a8b2a3937541d
       DECKHAND_IMAGE_DISTRO: ubuntu_focal
+      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
+      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
+      OSH_INFRA_COMMIT: db3537e56b182a54e7f6931ce57e2a190714019b
+      OSH_COMMIT: 75c30f43db44218e7842611e880fd8d7a30fa79c
       distro: ubuntu_focal
     irrelevant-files:
       - ^.*\.rst$
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index cd9194c6..0fa356ef 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -36,6 +36,7 @@
         set -ex
         export CLONE_DECKHAND={{ CLONE_DECKHAND }}
         export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }}
+        export OSH_COMMIT={{ OSH_COMMIT }}
         ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
@@ -98,6 +99,8 @@
     - name: Build all charts locally
       shell: |
         set -ex
+        export HELM_ARTIFACT_URL={{ HELM_ARTIFACT_URL }}
+        export HTK_COMMIT={{ HTK_COMMIT }}
         ./tools/deployment/airskiff/developer/015-make-all-charts.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 56dabed6..327f6482 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -17,7 +17,7 @@
 set -eux
 
 HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"443ff3e3e340c94c5cbb214d1e2a8b2a3937541d"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"51c70e48dff173281a77d374d87af2c49caa6348"}
 
 TMP_DIR=$(mktemp -d)