diff --git a/scripts/bootstrap-overcloud-full.sh b/scripts/bootstrap-overcloud-full.sh
index 522ae9187..244b08fab 100755
--- a/scripts/bootstrap-overcloud-full.sh
+++ b/scripts/bootstrap-overcloud-full.sh
@@ -48,7 +48,7 @@ export ELEMENTS_PATH="${COMMON_ELEMENTS_PATH}:/usr/share/instack-undercloud:/usr
 
 sudo yum -y install openstack-tripleo-common
 
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
 ELEMENTS=$(\
 tripleo-build-images \
   --image-json-output \
@@ -86,7 +86,7 @@ sudo -E instack \
   -x delorean-repo \
   -d
 
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
 PACKAGES=$(\
 tripleo-build-images \
   --image-json-output \
diff --git a/scripts/default-overrides.conf b/scripts/default-overrides.conf
index c690dab0f..35073ffd1 100644
--- a/scripts/default-overrides.conf
+++ b/scripts/default-overrides.conf
@@ -106,10 +106,6 @@ lock_path=/tmp
 # Added in kilo
 bootable=true
 
-# It needs to be true since mitaka
-# this option expected to be removed after liberty EOL
-volume_services=true
-
 [compute-feature-enabled]
 # Default deployment does not use shared storage
 live_migration=false
diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index e664e46ac..005b8234e 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -124,7 +124,7 @@ OVERCLOUD_DELETE=${OVERCLOUD_DELETE:-""}
 OVERCLOUD_DELETE_TIMEOUT=${OVERCLOUD_DELETE_TIMEOUT:-"300"}
 OVERCLOUD_DEPLOY_ARGS=${OVERCLOUD_DEPLOY_ARGS:-""}
 # --validation-errors-fatal was deprecated in newton and removed in ocata
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]]; then
+if [[ "${STABLE_RELEASE}" = "mitaka" ]]; then
     OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-errors-fatal --validation-warnings-fatal"}
 else
     OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-warnings-fatal"}
@@ -160,8 +160,8 @@ OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF:-"\
     $REPO_PREFIX/delorean.repo \
     $REPO_PREFIX/delorean-current.repo \
     $REPO_PREFIX/delorean-deps.repo"}
-# Use Ceph/Jewel for all but liberty/mitaka
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+# Use Ceph/Jewel for all but mitaka
+if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
   OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF}"\
     $REPO_PREFIX/CentOS-Ceph-Hammer.repo"
 else
@@ -196,7 +196,7 @@ export SCRIPTS_DIR=$(dirname ${BASH_SOURCE[0]:-$0})
 OPSTOOLS_REPO_ENABLED=${OPSTOOLS_REPO_ENABLED:-"0"}
 OPSTOOLS_REPO_URL=${OPSTOOLS_REPO_URL:-"https://raw.githubusercontent.com/centos-opstools/opstools-repo/master/opstools.repo"}
 
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
     export OS_IMAGE_API_VERSION=1
 fi
 # Temporary workarounds
@@ -268,7 +268,7 @@ function repo_setup {
 
     if [ "$TRIPLEO_OS_DISTRO" = "centos" ]; then
         # Enable Storage/SIG Ceph repo
-        if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+        if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
             CEPH_REPO_RPM=centos-release-ceph-hammer
             CEPH_REPO_FILE=CentOS-Ceph-Hammer.repo
         else
@@ -451,7 +451,7 @@ function delorean_build {
         GITHASH=$(git rev-parse HEAD)
 
         # Set the branches delorean reads to the same git hash as PROJ has left for us
-        for BRANCH in master origin/master stable/liberty origin/stable/liberty stable/mitaka origin/stable/mitaka; do
+        for BRANCH in master origin/master stable/mitaka origin/stable/mitaka; do
             git checkout -b $BRANCH || git checkout $BRANCH
             git reset --hard $GITHASH
         done
@@ -546,7 +546,7 @@ except:
     log "Overcloud images saved in $OVERCLOUD_IMAGES_PATH"
     pushd $OVERCLOUD_IMAGES_PATH
     log "OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF"
-    if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka|newton)$ ]] ; then
+    if [[ "${STABLE_RELEASE}" =~ ^(mitaka|newton)$ ]] ; then
         OVERCLOUD_IMAGES_ARGS="$OVERCLOUD_IMAGES_LEGACY_ARGS"
     fi
     DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF \
@@ -573,7 +573,7 @@ function register_nodes {
     fi
 
     stackrc_check
-    if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+    if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
         openstack baremetal import --json $INSTACKENV_JSON_PATH
         # This step is a part of the import command from Newton on
         openstack baremetal configure boot
diff --git a/test-environments/tls-endpoints-public-ip.yaml b/test-environments/tls-endpoints-public-ip.yaml
index 826db4a64..054ab46af 100644
--- a/test-environments/tls-endpoints-public-ip.yaml
+++ b/test-environments/tls-endpoints-public-ip.yaml
@@ -1,5 +1,5 @@
-# This is for liberty and Mitaka. In newton and beyond we have a separate file
-# for the endpoints so we won't need to maintain this in two repos.
+# This is for Mitaka. In newton and beyond we have a separate file for
+# the endpoints so we won't need to maintain this in two repos.
 parameter_defaults:
   EndpointMap:
     AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
diff --git a/toci_gate_test.sh b/toci_gate_test.sh
index 47409dc30..68c204cd5 100755
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@@ -191,7 +191,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             PACEMAKER=1
             ;;
         nonha)
-            if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+            if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
                 ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
                 CA_ENVIRONMENT_FILE=inject-trust-anchor.yaml
             else
@@ -268,7 +268,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             CACHEUPLOAD=1
             OVERCLOUD_PINGTEST_ARGS=
             ;;
-        liberty|mitaka)
+        mitaka)
             # This is handled in tripleo.sh (it always uses centos7-$STABLE_RELEASE/current)
             # where $STABLE_RELEASE is derived in toci_instack.sh
             unset DELOREAN_REPO_URL
@@ -306,7 +306,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
 done
 
 # Limit worker counts to avoid overloading our limited resources
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
     OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
 else
     OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
diff --git a/toci_instack_oooq.sh b/toci_instack_oooq.sh
index 865ed8a72..58adf2ffe 100755
--- a/toci_instack_oooq.sh
+++ b/toci_instack_oooq.sh
@@ -45,7 +45,7 @@ else
 fi
 
 # TODO(sshnaidm): to move these variables to jobs yaml config files (see above)
-if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
+if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
     export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
 else
     export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"