diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/agent/alpine/docker-entrypoint.sh
+++ b/agent/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/agent/centos/docker-entrypoint.sh
+++ b/agent/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/agent/ubuntu/docker-entrypoint.sh
+++ b/agent/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/java-gateway/alpine/docker-entrypoint.sh
+++ b/java-gateway/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/java-gateway/centos/docker-entrypoint.sh
+++ b/java-gateway/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/java-gateway/ubuntu/docker-entrypoint.sh
+++ b/java-gateway/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/proxy-mysql/alpine/docker-entrypoint.sh
+++ b/proxy-mysql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/proxy-mysql/centos/docker-entrypoint.sh
+++ b/proxy-mysql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/proxy-mysql/ubuntu/docker-entrypoint.sh
+++ b/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/proxy-sqlite3/alpine/docker-entrypoint.sh
+++ b/proxy-sqlite3/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/proxy-sqlite3/centos/docker-entrypoint.sh
+++ b/proxy-sqlite3/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh
+++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/server-mysql/alpine/docker-entrypoint.sh
+++ b/server-mysql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/server-mysql/centos/docker-entrypoint.sh
+++ b/server-mysql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/server-mysql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/server-pgsql/alpine/docker-entrypoint.sh
+++ b/server-pgsql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/server-pgsql/centos/docker-entrypoint.sh
+++ b/server-pgsql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-apache-mysql/alpine/docker-entrypoint.sh
+++ b/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-apache-mysql/centos/docker-entrypoint.sh
+++ b/web-apache-mysql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-apache-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-apache-pgsql/alpine/docker-entrypoint.sh
+++ b/web-apache-pgsql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-apache-pgsql/centos/docker-entrypoint.sh
+++ b/web-apache-pgsql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi
diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index e6d0bf9a9..7d8567cc4 100755
--- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -64,7 +64,7 @@ update_config_var() {
 
     # Remove configuration parameter definition in case of unset parameter value
     if [ -z "$var_value" ]; then
-        sed -i -e "/$var_name=/d" "$config_path"
+        sed -i -e "/^$var_name=/d" "$config_path"
         echo "removed"
         return
     fi