diff --git a/tools/deployment/common/get-values-overrides.sh b/tools/deployment/common/get-values-overrides.sh
index d0754d4f92..4efa59aecd 100755
--- a/tools/deployment/common/get-values-overrides.sh
+++ b/tools/deployment/common/get-values-overrides.sh
@@ -21,9 +21,9 @@
 set -e
 HELM_CHART="$1"
 : "${HELM_CHART_ROOT_PATH:="../openstack-helm"}"
-: "${OPENSTACK_RELEASE:="ocata"}"
+: "${OPENSTACK_RELEASE:="train"}"
 : "${CONTAINER_DISTRO_NAME:="ubuntu"}"
-: "${CONTAINER_DISTRO_VERSION:="xenial"}"
+: "${CONTAINER_DISTRO_VERSION:="bionic"}"
 : "${FEATURE_GATES:=""}"
 OSH_FEATURE_MIX="${FEATURE_GATES},${OPENSTACK_RELEASE},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"
 
diff --git a/tools/deployment/developer/common/170-setup-gateway.sh b/tools/deployment/developer/common/170-setup-gateway.sh
index 5cc68c682e..4abc86b3bb 100755
--- a/tools/deployment/developer/common/170-setup-gateway.sh
+++ b/tools/deployment/developer/common/170-setup-gateway.sh
@@ -19,7 +19,7 @@ set -xe
 sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex
 sudo ip link set br-ex up
 
-: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:ocata}
+: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:train-ubuntu_bionic}
 
 # NOTE(portdirect): With Docker >= 1.13.1 the default FORWARD chain policy is
 # configured to DROP, for the l3 agent to function as expected and for