diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 971d1f76eb..e022906df0 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -52,12 +52,16 @@ EOF
         GATE_IMAGES+=",tacker,mistral,redis,barbican"
     fi
 
+    # Use the kolla-ansible tag rather than the kolla tag, since this is what
+    # kolla-ansible will use by default.
+    TAG=$(python -c "import pbr.version; print(pbr.version.VersionInfo('kolla-ansible'))")
     cat <<EOF | sudo tee /etc/kolla/kolla-build.conf
 [DEFAULT]
 include_header = /etc/kolla/header
 namespace = lokolla
 base = ${BASE_DISTRO}
 install_type = ${INSTALL_TYPE}
+tag = ${TAG}
 profile = gate
 registry = 127.0.0.1:4000
 push = true