diff --git a/.zuul.yaml b/.zuul.yaml
index 0fec3ec8..1db1f490 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -72,7 +72,7 @@
     run: tools/gate/playbooks/build-charts.yaml
     nodeset: airship-shipyard-single-node-focal
     vars:
-      HTK_COMMIT: a7cd689280cdbc0acd04a7a1b745941260e8700b
+      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
 
 - job:
     name: airship-shipyard-chart-build-latest-htk
@@ -132,8 +132,11 @@
       - airship/treasuremap
     vars:
       CLONE_SHIPYARD: false
-      HTK_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
       SHIPYARD_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
     irrelevant-files: *irrelevant-files
 
 
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index d4d885da..397e2fc3 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -36,7 +36,8 @@
     - name: Clone Required Repositories
       shell: |
         export CLONE_SHIPYARD={{ CLONE_SHIPYARD }}
-        export OSH_INFRA_COMMIT={{ HTK_COMMIT }}
+        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 }}"
@@ -75,6 +76,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 }}"
@@ -149,4 +152,4 @@
         docker rm artifacts --force || true
       args:
         chdir: "{{ zuul.project.src_dir }}"
-      become: yes
+      become: yes
\ No newline at end of file
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index b90d5198..f5bb596e 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:-"a7cd689280cdbc0acd04a7a1b745941260e8700b"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"51c70e48dff173281a77d374d87af2c49caa6348"}