diff --git a/images/deckhand/Dockerfile.opensuse_15 b/images/deckhand/Dockerfile.opensuse_15
index a74802af..50deaccd 100644
--- a/images/deckhand/Dockerfile.opensuse_15
+++ b/images/deckhand/Dockerfile.opensuse_15
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG FROM=opensuse/leap:15.1
+ARG FROM=opensuse/leap:15.3
 FROM ${FROM}
 
 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'
@@ -50,9 +50,9 @@ RUN set -x && \
     python3-pip \
     python3-python-dateutil \
     python3-setuptools \
-    && zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.1/devel:languages:python.repo \
+    && zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.3/devel:languages:python.repo \
     && zypper --non-interactive --gpg-auto-import-keys refresh devel_languages_python \
-    && zypper --non-interactive install python3-six-1.11.0-lp151.3.1.noarch
+    && zypper --non-interactive install python3-six-1.16.0-lp153.103.1.noarch
 
 RUN pip3 install -U pip \
     && zypper clean -a \
diff --git a/images/deckhand/Dockerfile.ubuntu_xenial b/images/deckhand/Dockerfile.ubuntu_xenial
index 3cdbe7f6..75341d6a 100644
--- a/images/deckhand/Dockerfile.ubuntu_xenial
+++ b/images/deckhand/Dockerfile.ubuntu_xenial
@@ -51,7 +51,7 @@ RUN set -x && \
     python3-pip \
     python3-setuptools \
     --no-install-recommends \
-    && python3 -m pip install -U pip \
+    && python3 -m pip install -U 'pip<21.0' \
     && apt-get clean \
     && rm -rf \
         /var/lib/apt/lists/* \
diff --git a/test-requirements.txt b/test-requirements.txt
index 4d925a41..1034c706 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,3 +20,4 @@ tox
 pylibyaml~=0.1
 six>=1.15.0
 pyparsing>=2.1.0
+openstacksdk==0.36.5
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index 14f2a0d5..5bdb7b02 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -35,6 +35,7 @@
     - name: Clone Required Repositories
       shell: |
         export CLONE_DECKHAND={{ CLONE_DECKHAND }}
+        export OSH_INFRA_COMMIT=master
         ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
@@ -51,13 +52,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 Deckhand with submitted changes
       shell: |
         make
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: