diff --git a/entrypoint/site-config.sh b/entrypoint/site-config.sh
index 50ea31c..0528c7d 100644
--- a/entrypoint/site-config.sh
+++ b/entrypoint/site-config.sh
@@ -26,12 +26,12 @@ if [ "$MULTISITE" = "yes" ] ; then
 			sed -i "/^${server}_.*=.*/d" "${NGINX_PREFIX}nginx.env"
 		fi
 	done
-	for var in $(env) ; do
-		name=$(echo "$var" | cut -d '=' -f 1)
+	for var in $(compgen -e) ; do
+		name=$(echo "$var")
 		check=$(echo "$name" | grep "^$1_")
 		if [ "$check" != "" ] ; then
 			repl_name=$(echo "$name" | sed "s~${1}_~~")
-			repl_value=$(echo "$var" | sed "s~${name}=~~")
+			repl_value=$(echo "${!var}")
 			read -r "$repl_name" <<< $repl_value
 			sed -i "/^${repl_name}=.*/d" "${NGINX_PREFIX}nginx.env"
 			sed -i "/^${name}=.*/d" "${NGINX_PREFIX}nginx.env"
diff --git a/entrypoint/utils.sh b/entrypoint/utils.sh
index 87c436b..c6823f5 100644
--- a/entrypoint/utils.sh
+++ b/entrypoint/utils.sh
@@ -26,10 +26,10 @@ function has_value() {
 		echo "ok"
 		return 0
 	fi
-	for var in $(env) ; do
+	for var in $(compgen -e) ; do
 		domain=$(echo "$var" | cut -d '_' -f 1)
 		name=$(echo "$var" | cut -d '=' -f 1 | sed "s~${domain}_~~")
-		value=$(echo "$var" | sed "s~${domain}_${name}=~~")
+		value=$(echo "${!var}")
 		if [ "$name" == "$1" ] && [ "$value" == "$2" ] ; then
 			echo "ok"
 			return 0