diff --git a/.zuul.yaml b/.zuul.yaml
index 00555817..bfd57dda 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -61,7 +61,7 @@
     run: tools/gate/playbooks/build-charts.yaml
     nodeset: armada-single-node-focal
     vars:
-      HTK_COMMIT: a7cd689280cdbc0acd04a7a1b745941260e8700b
+      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
 
 
 - job:
@@ -103,8 +103,11 @@
       - airship/treasuremap
     vars:
       CLONE_ARMADA: false
-      OSH_INFRA_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
       ARMADA_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:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/test-requirements.txt b/test-requirements.txt
index 84af7c85..bdb15e0f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,11 +7,11 @@ grpcio-tools>=1.16.0
 os-testr>=1.0.0 # Apache-2.0
 pyflakes==2.2.0
 sphinx-rtd-theme==0.5.0
-stestr==3.2.0
+stestr==4.1.0
 testrepository==0.0.20
 testresources==2.0.1
 testscenarios==0.5.0
 # testtools==2.5.0
 # tox>=3.28.0, <4.0.0
 # typing-extensions>=3.7.2
-yapf==0.27.0
\ No newline at end of file
+yapf==0.27.0
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index ce3df824..2331a88c 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -34,6 +34,7 @@
       shell: |
         export CLONE_ARMADA={{ CLONE_ARMADA }}
         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 }}"
@@ -106,6 +107,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 d5bf8a6c..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:-"7b8d459d14a751021265cd29dbe9920ceac71f3a"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"51c70e48dff173281a77d374d87af2c49caa6348"}
 
 TMP_DIR=$(mktemp -d)