diff --git a/.zuul.yaml b/.zuul.yaml
index 2494b61c4..c4bd26d1b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -170,6 +170,7 @@
     nodeset: treasuremap-single-node-ubuntu-focal
     description: |
       Deploy Memcached using Airskiff and latest Treasuremap changes.
+      Airskiff is using latest Airship v1.x based on Airflow-2.6.2
     voting: true
     timeout: 9600
     pre-run:
@@ -179,7 +180,11 @@
     run: tools/gate/playbooks/airskiff-deploy-gate.yaml
     post-run: tools/gate/playbooks/debug-report.yaml
     vars:
-       site: airskiff
+      site: airskiff
+      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
+      HTK_COMMIT: 51c70e48dff173281a77d374d87af2c49caa6348
+      OSH_INFRA_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+      OSH_COMMIT: 56842b39d47ae0f1ca8ad8cb94ca102dd577777b
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/tools/deployment/airskiff/developer/010-deploy-k8s.sh b/tools/deployment/airskiff/developer/010-deploy-k8s.sh
index 4128b74dd..9ae549f5f 100755
--- a/tools/deployment/airskiff/developer/010-deploy-k8s.sh
+++ b/tools/deployment/airskiff/developer/010-deploy-k8s.sh
@@ -25,7 +25,7 @@ if [ -n "${PROXY}" ]; then
 fi
 
 # Deploy K8s with Minikube
-: "${HELM_VERSION:="v3.11.1"}"
+: "${HELM_VERSION:="v3.12.2"}"
 : "${KUBE_VERSION:="v1.27.3"}"
 : "${MINIKUBE_VERSION:="v1.30.1"}"
 : "${CRICTL_VERSION:="v1.27.0"}"
diff --git a/tools/gate/playbooks/airskiff-deploy-gate.yaml b/tools/gate/playbooks/airskiff-deploy-gate.yaml
index 8629e9c8c..affa1376e 100644
--- a/tools/gate/playbooks/airskiff-deploy-gate.yaml
+++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml
@@ -14,10 +14,19 @@
 
 - hosts: all
 
+  roles:
+    - role: add-authorized-keys
+      public_keys:
+        - public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA7eM8WFJrqQmki8rR0O3QBHyl8xq42jb1RduwuRwjWoGYJI5cX7Fx+7VR4A9ITCoiqxKS8DMfgKbt5jKC6SmvMALULZsnYlthB34KywurgxsW6fgp68DHWQ7J4CCBhoIpl0W3JW7s6b0vHLhab59r0E+AYemBVuWUqbFEy8nDAHcQv1S/2o1udhmljIN7c2ogO4KAJ7Lge0BoIP9ps4u6AVwyQZixp4anU9DHGNA/UQj4M5UyuALj5buEAuATBe9Vqj4sOvZjObPJAGPUrNRrGEWAFk+lSZHRzKXo0eeWtPqoh5UN9UDb5Pocg1krncMIZwjHKovlD1z/O1y91aY5LM1wxm/7aaIiX8eCihyVZaOuDCLF7WDT2SMs7ABcotX2MDtVQTrNNV3MmMAScFNDflzPKszd7cdjLl6PBq8bvPxmCkLmnitPTGOoh9d8i+JlbINvgx1pguYrpeciIyreCO1rjTW3MgB0tyoMEa31V+7HrauBMeNnE68YTqLTIB0= smarkin@mirantis.com
+
   tasks:
     - name: Clone dependencies
       shell: |
         set -ex
+        
+        export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }}
+        export OSH_COMMIT={{ OSH_COMMIT }}
+
         ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
@@ -56,7 +65,11 @@
 
     - name: Build all charts locally
       shell: |
-        set -ex
+        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.project.src_dir }}"
@@ -88,6 +101,7 @@
     - name: Deploy Software using Airship
       shell: |
         set -ex
+        while true; do sleep 100; done
         export PL_SITE="{{ site }}"
         ./tools/deployment/airskiff/developer/100-deploy-osh.sh
       args: