diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 865d496945..d065f3bee8 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -484,8 +484,7 @@ admin_protocol: "{{ 'https' if kolla_enable_tls_internal | bool else 'http' }}"
 openstack_release: "master"
 # Docker image tag used by default.
 openstack_tag: "{{ openstack_release ~ openstack_tag_suffix }}"
-# TODO(mgoddard): Set to an empty string when CentOS 7 is no longer supported.
-openstack_tag_suffix: "{{ '' if kolla_base_distro != 'centos' or ansible_distribution_major_version == '7' else  '-centos8' }}"
+openstack_tag_suffix: ""
 openstack_logging_debug: "False"
 
 openstack_region_name: "RegionOne"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index c334431cd2..524edaa244 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -24,7 +24,7 @@
 #openstack_tag: "{{ openstack_release ~ openstack_tag_suffix }}"
 
 # Suffix applied to openstack_release to generate openstack_tag.
-#openstack_tag_suffix: "{{ '' if base_distro != 'centos' or ansible_distribution_major_version == '7' else  '-centos8' }}"
+#openstack_tag_suffix: ""
 
 # Location of configuration overrides
 #node_custom_config: "/etc/kolla/config"
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 793610675b..eca13e7f9c 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -98,14 +98,7 @@ function prepare_images {
     fi
     sudo docker run -d -p 4000:5000 --restart=always -v /opt/kolla_registry/:/var/lib/registry --name registry registry:2
     pushd "${KOLLA_SRC_DIR}"
-    # TODO(mgoddard): Remove this if block when CentOS 7 is no longer
-    # supported.
-    if [[ $BASE_DISTRO == "centos" ]] && [[ $BASE_DISTRO_MAJOR_VERSION -eq 8 ]]; then
-        kolla_base_distro=centos8
-    else
-        kolla_base_distro=${BASE_DISTRO}
-    fi
-    sudo tox -e "build-${kolla_base_distro}-${INSTALL_TYPE}"
+    sudo tox -e "build-${BASE_DISTRO}-${INSTALL_TYPE}"
     # NOTE(yoctozepto): due to debian buster we push after images are built
     # see https://github.com/docker/for-linux/issues/711
     if [[ "debian" == $BASE_DISTRO ]]; then