diff --git a/.zuul.yaml b/.zuul.yaml
index 956158d..5b45fdb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,7 +15,6 @@
       jobs:
         - airship-divingbell-linter
         - airship-divingbell-ubuntu:
-            voting: false
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
diff --git a/divingbell/tools/gate/setup.sh b/divingbell/tools/gate/setup.sh
deleted file mode 100755
index 0f23952..0000000
--- a/divingbell/tools/gate/setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-export TMP_DIR=$(mktemp -d)
-cd $TMP_DIR
-git clone https://git.openstack.org/openstack/openstack-helm
-cd openstack-helm/tools/gate/
-./setup_gate.sh
diff --git a/tools/gate/playbooks/airship-divingbell-check.yaml b/tools/gate/playbooks/airship-divingbell-check.yaml
index 89cbd90..dd92cce 100644
--- a/tools/gate/playbooks/airship-divingbell-check.yaml
+++ b/tools/gate/playbooks/airship-divingbell-check.yaml
@@ -16,7 +16,8 @@
   tasks:
     - name: Build Charts
       shell: |
-        set -xe;
+        set -e;
         ./tools/gate/scripts/010-build-charts.sh
+        sudo ./tools/gate/scripts/020-test-divingbell.sh
       args:
         chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/osh-infra-deploy-docker.yaml b/tools/gate/playbooks/osh-infra-deploy-docker.yaml
index 4c54324..7bf66fa 100644
--- a/tools/gate/playbooks/osh-infra-deploy-docker.yaml
+++ b/tools/gate/playbooks/osh-infra-deploy-docker.yaml
@@ -35,9 +35,9 @@
     - setup-firewall
     - deploy-python-pip
     - deploy-docker
-    - deploy-yq
+    - deploy-jq
   tags:
     - setup-firewall
     - deploy-python-pip
     - deploy-docker
-    - deploy-yq
+    - deploy-jq
diff --git a/divingbell/tools/gate/test.sh b/tools/gate/scripts/020-test-divingbell.sh
similarity index 98%
rename from divingbell/tools/gate/test.sh
rename to tools/gate/scripts/020-test-divingbell.sh
index 876950e..22c3347 100755
--- a/divingbell/tools/gate/test.sh
+++ b/tools/gate/scripts/020-test-divingbell.sh
@@ -10,9 +10,7 @@ NAME=divingbell
 mkdir -p "${LOGS_SUBDIR}"
 LOG_NAME="${LOGS_SUBDIR}/test.log"
 TEST_RESULTS="${LOGS_SUBDIR}/results.log"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "${DIR}"
-BASE_VALS="--values=${DIR}/../../values.yaml"
+BASE_VALS="--values=divingbell/values.yaml"
 SYSCTL_KEY1=net.ipv4.conf.all.log_martians
 SYSCTL_VAL1_DEFAULT=1
 SYSCTL_KEY2=net.ipv4.conf.all.secure_redirects
@@ -46,6 +44,7 @@ USERNAME3=userthree
 USERNAME3_SUDO=true
 USERNAME4=userfour
 USERNAME4_SUDO=false
+type lshw || apt -y install lshw
 nic_info="$(lshw -class network)"
 physical_nic=''
 IFS=$'\n'
@@ -118,9 +117,6 @@ _reset_account(){
 }
 
 init_default_state(){
-  if [ "${1}" = 'make' ]; then
-    (cd ../../../; make)
-  fi
   purge_containers
   clean_persistent_files
   # set sysctl original vals
@@ -142,15 +138,15 @@ init_default_state(){
 
 install(){
   purge_containers
-  helm install --name="${NAME}" --debug "../../../${NAME}" --namespace="${NAME}" "$@"
+  helm install --name="${NAME}" --debug "${NAME}" --namespace="${NAME}" "$@"
 }
 
 upgrade(){
-  helm upgrade --name="${NAME}" --debug "../../../${NAME}" --namespace="${NAME}" "$@"
+  helm upgrade --name="${NAME}" --debug "${NAME}" --namespace="${NAME}" "$@"
 }
 
 dry_run(){
-  helm install --name="${NAME}" --dry-run --debug "../../../${NAME}" --namespace="${NAME}" "$@"
+  helm install --name="${NAME}" --dry-run --debug "${NAME}" --namespace="${NAME}" "$@"
 }
 
 get_container_status(){
@@ -976,7 +972,7 @@ test_overrides(){
 }
 
 # initialization
-init_default_state make
+init_default_state
 
 # run tests
 install_base