diff --git a/ceph-rgw/values_overrides/netpol.yaml b/ceph-rgw/values_overrides/netpol.yaml
index 4c09738184..b9f0898cd1 100644
--- a/ceph-rgw/values_overrides/netpol.yaml
+++ b/ceph-rgw/values_overrides/netpol.yaml
@@ -14,7 +14,7 @@ network_policy:
             port: 443
       - to:
         - ipBlock:
-            cidr: $API_ADDR/32
+            cidr: %%%REPLACE_API_ADDR%%%/32
         ports:
           - protocol: TCP
-            port: $API_PORT
+            port: %%%REPLACE_API_PORT%%%
diff --git a/mariadb/values_overrides/netpol.yaml b/mariadb/values_overrides/netpol.yaml
index f5ae02ebf5..7d6122be8e 100644
--- a/mariadb/values_overrides/netpol.yaml
+++ b/mariadb/values_overrides/netpol.yaml
@@ -5,7 +5,7 @@ network_policy:
     egress:
       - to:
         - ipBlock:
-            cidr: $API_ADDR/32
+            cidr: %%%REPLACE_API_ADDR%%%/32
         ports:
           - protocol: TCP
-            port: $API_PORT
+            port: %%%REPLACE_API_PORT%%%
diff --git a/memcached/values_overrides/netpol.yaml b/memcached/values_overrides/netpol.yaml
index 204e64cce8..4a59c52772 100644
--- a/memcached/values_overrides/netpol.yaml
+++ b/memcached/values_overrides/netpol.yaml
@@ -5,7 +5,7 @@ network_policy:
     egress:
       - to:
         - ipBlock:
-            cidr: $API_ADDR/32
+            cidr: %%%REPLACE_API_ADDR%%%/32
         ports:
           - protocol: TCP
-            port: $API_PORT
+            port: %%%REPLACE_API_PORT%%%
diff --git a/rabbitmq/values_overrides/netpol.yaml b/rabbitmq/values_overrides/netpol.yaml
index 497955842e..d56e425c46 100644
--- a/rabbitmq/values_overrides/netpol.yaml
+++ b/rabbitmq/values_overrides/netpol.yaml
@@ -102,7 +102,7 @@ network_policy:
           #  port: 35197
       - to:
         - ipBlock:
-            cidr: $API_ADDR/32
+            cidr: %%%REPLACE_API_ADDR%%%/32
         ports:
           - protocol: TCP
-            port: $API_PORT
+            port: %%%REPLACE_API_PORT%%%
diff --git a/tools/deployment/common/get-values-overrides.sh b/tools/deployment/common/get-values-overrides.sh
index ef1b588f38..c497e30e0b 100755
--- a/tools/deployment/common/get-values-overrides.sh
+++ b/tools/deployment/common/get-values-overrides.sh
@@ -47,14 +47,21 @@ function combination () {
   done
 }
 
+function replace_variables() {
+  for key in $(env); do
+    local arr=( $(echo $key | awk -F'=' '{ print $1, $2}') )
+    sed -i "s#%%%REPLACE_${arr[0]}%%%#${arr[1]}#g" $@
+  done
+}
+
 function override_file_args () {
   OVERRIDE_ARGS=""
   echoerr "We will attempt to use values-override files with the following paths:"
   for FILE in $(combination ${1//,/ } | uniq | tac); do
     FILE_PATH="${HELM_CHART_ROOT_PATH}/${HELM_CHART}/values_overrides/${FILE}.yaml"
     if [ -f "${FILE_PATH}" ]; then
-      envsubst < ${FILE_PATH} > /tmp/${HELM_CHART}-${FILE}.yaml
-      OVERRIDE_ARGS+=" --values=/tmp/${HELM_CHART}-${FILE}.yaml "
+      replace_variables ${FILE_PATH}
+      OVERRIDE_ARGS+=" --values=${FILE_PATH} "
     fi
       echoerr "${FILE_PATH}"
   done