diff --git a/.zuul.yaml b/.zuul.yaml
index 057e86a1..91ed18cf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -121,6 +121,7 @@
       - airship/treasuremap
     vars:
       CLONE_ARMADA: false
+      HTK_COMMIT: master
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/test-requirements.txt b/test-requirements.txt
index 19bf54e8..c3b27924 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,3 +18,4 @@ yapf==0.27.0
 flake8-import-order==0.18.1
 
 grpcio-tools==1.16.0
+typing-extensions==3.7.2
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index 10be09d7..f654301d 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -36,6 +36,7 @@
     - name: Clone Required Repositories
       shell: |
         export CLONE_ARMADA={{ CLONE_ARMADA }}
+        export OSH_INFRA_COMMIT={{ HTK_COMMIT }}
         ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
@@ -52,13 +53,6 @@
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
 
-    - name: Setup OpenStack Client
-      shell: |
-        ./tools/deployment/airskiff/developer/020-setup-client.sh
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-      become: yes
-
     - name: Build Armada with submitted changes
       shell: |
         make images
diff --git a/tools/gate/playbooks/airskiff-reduce-site.yaml b/tools/gate/playbooks/airskiff-reduce-site.yaml
index c0953a38..7c80ed77 100644
--- a/tools/gate/playbooks/airskiff-reduce-site.yaml
+++ b/tools/gate/playbooks/airskiff-reduce-site.yaml
@@ -16,6 +16,7 @@
   tasks:
     - name: Overwrite Armada manifest
       shell: |
+        git checkout v1.9
         mv tools/gate/manifests/full-site.yaml \
             type/skiff/manifests/full-site.yaml
       args: