diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index d8b3eb04..b635b750 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -530,7 +530,7 @@ data:
         memcached: docker.io/memcached:1.5.5
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
       rabbitmq:
-        rabbitmq: docker.io/rabbitmq:3.7
+        rabbitmq: docker.io/rabbitmq:3.7.4
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     #TODO Update to split ceph charts
     ceph:
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index e134eac7..8be93b9f 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -379,7 +379,7 @@ data:
         memcached: docker.io/memcached:1.5.5
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
       rabbitmq:
-        rabbitmq: docker.io/rabbitmq:3.7
+        rabbitmq: docker.io/rabbitmq:3.7.4
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     #TODO Update to split ceph charts
     ceph:
diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index d897cffd..d42d0645 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -6,18 +6,18 @@ export SCRIPT_DEPOT="${TEMP_DIR}/scripts/"
 export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work}
 export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
 export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
-export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:master}
+export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22}
 export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:ac6297eae6c51ab2f13a96978abaaa10cb46e3d6}
-export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:master}
+export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461}
 export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
-export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:master}
+export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
 export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
 export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-password18}
 export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
 export VIRSH_POOL=${VIRSH_POOL:-airship}
 export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
 export VIRSH_CPU_OPTS=${VIRSH_CPU_OPTS:-host}
-export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 208.67.220.220"}
+export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 8.8.4.4"}
 
 config_vm_memory() {
     nodename=${1}