diff --git a/tools/deployment/common/ingress.sh b/tools/deployment/common/ingress.sh
index 93d38cf8b1..3b14d0f2fe 100755
--- a/tools/deployment/common/ingress.sh
+++ b/tools/deployment/common/ingress.sh
@@ -18,7 +18,7 @@ set -xe
 
 helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 
-if ! [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
+if ! [[ ${FEATURES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
     #NOTE: Deploy cluster ingress
     helm upgrade --install ingress-nginx-cluster ingress-nginx/ingress-nginx \
     --version ${HELM_INGRESS_NGINX_VERSION} \
diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 7f51946b1b..5c08198415 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -16,7 +16,7 @@ set -xe
 
 sudo -H mkdir -p /etc/openstack
 sudo -H chown -R $(id -un): /etc/openstack
-FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
   tee /etc/openstack/clouds.yaml << EOF
   clouds:
     openstack_helm:
diff --git a/tools/deployment/common/setup-gateway.sh b/tools/deployment/common/setup-gateway.sh
index de8d1d1724..8f5781de34 100755
--- a/tools/deployment/common/setup-gateway.sh
+++ b/tools/deployment/common/setup-gateway.sh
@@ -16,7 +16,7 @@ set -xe
 # By default we set enable-chassis-as-gw on all OVN controllers which means
 # all nodes are connected to the provider network, but for test environment this is not
 # the case.
-if [[ "$FEATURE_GATES" =~ (,|^)ovn(,|$) ]]; then
+if [[ "$FEATURES" =~ (,|^)ovn(,|$) ]]; then
 HOSTNAME=$(hostname -f)
 kubectl -n openstack get po --selector application=ovn,component=ovn-controller -o name | while read po; do
   kubectl -n openstack exec $po -c controller -- bash -c "if [[ \$(hostname -f) != ${HOSTNAME} ]]; then ovs-vsctl set open . external-ids:ovn-cms-options=availability-zones=nova; fi"
diff --git a/tools/deployment/common/use-it.sh b/tools/deployment/common/use-it.sh
index f346033de6..472e1a8cae 100755
--- a/tools/deployment/common/use-it.sh
+++ b/tools/deployment/common/use-it.sh
@@ -14,7 +14,7 @@
 set -xe
 
 DPDK_ENABLED=disabled
-if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])dpdk($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])dpdk($|[[:space:]]) ]]; then
     DPDK_ENABLED=enabled
 fi
 
diff --git a/tools/deployment/component/heat/heat.sh b/tools/deployment/component/heat/heat.sh
index 4e430af896..94783db5c0 100755
--- a/tools/deployment/component/heat/heat.sh
+++ b/tools/deployment/component/heat/heat.sh
@@ -35,6 +35,6 @@ sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and rest
 
 openstack orchestration service list
 
-FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://heat.openstack.svc.cluster.local
 fi
diff --git a/tools/deployment/component/horizon/horizon.sh b/tools/deployment/component/horizon/horizon.sh
index 2817846e65..9bbd9154cd 100755
--- a/tools/deployment/component/horizon/horizon.sh
+++ b/tools/deployment/component/horizon/horizon.sh
@@ -33,6 +33,6 @@ if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
     ./tools/deployment/common/run-helm-tests.sh horizon
 fi
 
-FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://horizon.openstack.svc.cluster.local
 fi
diff --git a/tools/deployment/component/keystone/keystone.sh b/tools/deployment/component/keystone/keystone.sh
index 6b6ed9e4a4..b5f3a24c45 100755
--- a/tools/deployment/component/keystone/keystone.sh
+++ b/tools/deployment/component/keystone/keystone.sh
@@ -34,7 +34,7 @@ sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and rest
 openstack endpoint list
 
 #NOTE: Validate feature gate options if required
-FEATURE_GATE="ldap"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])ldap($|[[:space:]]) ]]; then
   #NOTE: Do some additional queries here for LDAP
   openstack domain list
   openstack user list
@@ -63,6 +63,6 @@ if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
     ./tools/deployment/common/run-helm-tests.sh keystone
 fi
 
-FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
+if [[ ${FEATURES//,/ } =~ (^|[[:space:]])tls($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://keystone.openstack.svc.cluster.local
 fi