diff --git a/doc/requirements.txt b/doc/requirements.txt
index 8649567a..eaa008df 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -18,7 +18,7 @@ beaker==1.10.0
 deepdiff==3.3.0
 falcon==1.4.1
 jsonpath-ng==1.4.3
-jsonschema>=3.0.1<4
+jsonschema==4.0.0a2
 keystoneauth1==3.11.1
 networkx==2.2
 Paste==3.0.1
diff --git a/images/deckhand/Dockerfile.opensuse_15 b/images/deckhand/Dockerfile.opensuse_15
index 50deaccd..6ca805f4 100644
--- a/images/deckhand/Dockerfile.opensuse_15
+++ b/images/deckhand/Dockerfile.opensuse_15
@@ -52,7 +52,7 @@ RUN set -x && \
     python3-setuptools \
     && 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.16.0-lp153.103.1.noarch
+    && zypper --non-interactive install python3-six
 
 RUN pip3 install -U pip \
     && zypper clean -a \
diff --git a/requirements.txt b/requirements.txt
index 6633eac1..ad8c4cb9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ cryptography>=2.7
 deepdiff==3.3.0
 falcon==1.4.1
 jsonpath-ng==1.4.3
-jsonschema>=3.0.1<4
+jsonschema==4.0.0a2
 keystoneauth1>=3.18.0
 keystonemiddleware==5.3.0
 kombu<4.7,>=4.6.10
diff --git a/tools/gate/playbooks/run-integration-tests-docker.yaml b/tools/gate/playbooks/run-integration-tests-docker.yaml
index 68f2d29b..61e8c83c 100644
--- a/tools/gate/playbooks/run-integration-tests-docker.yaml
+++ b/tools/gate/playbooks/run-integration-tests-docker.yaml
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 - hosts: all
+  vars_files:
+    - vars.yaml
   roles:
     - install-test-requirements
     - build-images
diff --git a/tools/gate/playbooks/run-integration-tests-uwsgi.yaml b/tools/gate/playbooks/run-integration-tests-uwsgi.yaml
index b5f1e3f1..0e1c0f58 100644
--- a/tools/gate/playbooks/run-integration-tests-uwsgi.yaml
+++ b/tools/gate/playbooks/run-integration-tests-uwsgi.yaml
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 - hosts: all
+  vars_files:
+    - vars.yaml
   gather_facts: False
   roles:
     - disable-systemd-resolved
diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml
index 8fb0e3c1..7e45b7e1 100644
--- a/tools/gate/playbooks/vars.yaml
+++ b/tools/gate/playbooks/vars.yaml
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-zuul_airship_deckhand_relative_path: ../airship-deckhand
+barbican_stable_commit: 3ac3caa0138d44aa6031848d5b83802128a169b5
diff --git a/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml b/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
index 19d14144..765a4edd 100644
--- a/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
+++ b/tools/gate/roles/deploy-barbican/tasks/deploy-barbican.yaml
@@ -15,6 +15,7 @@
 - name: Deploy Barbican
   shell: |
     set -xe;
+    git reset --hard "{{ barbican_stable_commit | default('') }}"
     ./tools/deployment/component/barbican/barbican.sh
   args:
     chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
diff --git a/tools/gate/roles/run-integration-tests/tasks/integration-tests.yaml b/tools/gate/roles/run-integration-tests/tasks/integration-tests.yaml
index 06455284..230bcb73 100644
--- a/tools/gate/roles/run-integration-tests/tasks/integration-tests.yaml
+++ b/tools/gate/roles/run-integration-tests/tasks/integration-tests.yaml
@@ -61,5 +61,6 @@
   environment:
     DECKHAND_TEST_URL: "127.0.0.1:9000"
     DECKHAND_TEST_DIR: "{{ airship_deckhand_path.stdout }}/deckhand/tests/integration/gabbits"
+    BARBICAN_STABLE_COMMIT: "{{ barbican_stable_commit }}"
   register: result
   failed_when: "result.rc != 0"
diff --git a/tools/helm_install.sh b/tools/helm_install.sh
index 2875ade3..6e4c042c 100755
--- a/tools/helm_install.sh
+++ b/tools/helm_install.sh
@@ -17,7 +17,7 @@
 set -x
 
 HELM=$1
-HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz"}
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz"}
 
 
 function install_helm_binary {
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index d5d2d2b5..bb6d1fc6 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -18,7 +18,7 @@
 HELM=$1
 HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
 HTK_PATH=${HTK_PATH:-""}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"4fe6212dad6e3f07d43122485d60ab8f38642293"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"830df06628e4257ddc656a8869f3705e7b148f49"}
 BUILD_DIR=${BUILD_DIR:-$(mktemp -d)}
 
 if [[ ! -z $(echo $http_proxy) ]]
diff --git a/tools/integration-tests.sh b/tools/integration-tests.sh
index 72327aa2..8dc63161 100755
--- a/tools/integration-tests.sh
+++ b/tools/integration-tests.sh
@@ -47,6 +47,7 @@ function deploy_osh_keystone_barbican {
     fi
 
     cd ${OSH_PATH}
+    git reset --hard ${BARBICAN_STABLE_COMMIT}
     # Deploy required packages
     ./tools/deployment/common/install-packages.sh
     # Deploy Kubernetes