diff --git a/21.Initialize_configuration_file/0_setup.sh b/21.Initialize_configuration_file/0_setup.sh
index a22315a4fb21fdc77efc0a0e65a8205cc1889116..a10283d23fd232e1494009aa421dd8a645d5ddcd 100755
--- a/21.Initialize_configuration_file/0_setup.sh
+++ b/21.Initialize_configuration_file/0_setup.sh
@@ -13,18 +13,20 @@ fi
 # Autogenerate missing values
 if [ "${MS_ID}" = "" ]; then
 	MS_ID=$(echo "$(hostname)_msuser")
+	sed -i "s@^MS_ID=.*@MS_ID='${MS_ID}'@" /root/envsetup/conf.sh
 fi
 if [ "${MS_API_KEY}" = "" ]; then
 	MS_API_KEY=$(echo "s$(pwgen 4)-$(pwgen 5)-$(pwgen 5)-$(pwgen 5)-$(pwgen 5)")
 	# respect API pattern
 	MS_API_KEY=$(echo $MS_API_KEY | sed "s@[iloILO]@$((${RANDOM} / 10000))@g")
+	sed -i "s@^MS_API_KEY=.*@MS_API_KEY='${MS_API_KEY}'@" /root/envsetup/conf.sh
 fi
 if [ "${MS_SECRET}" = "secret" ]; then
 	MS_SECRET=$(echo "$(pwgen 40)")
+	sed -i "s@^MS_SECRET=.*@MS_SECRET='${MS_SECRET}'@" /root/envsetup/conf.sh
 fi
-sed -i "s@^MS_ID=.*@MS_ID='${MS_ID}'@" /root/envsetup/conf.sh
-sed -i "s@^MS_API_KEY=.*@MS_API_KEY='${MS_API_KEY}'@" /root/envsetup/conf.sh
-sed -i "s@^MS_SECRET=.*@MS_SECRET='${MS_SECRET}'@" /root/envsetup/conf.sh
 # Worker IP for whitelist
-CELERITY_WORKER_IP=$(ip addr show | grep inet | grep -v 127 | grep -v ":" | awk -F " " '{print$2}' | awk -F "/" '{print$1}')
-sed -i "s@^CELERITY_CELERITY_WORKER_IP=.*@CELERITY_CELERITY_WORKER_IP='${CELERITY_WORKER_IP}'@" /root/envsetup/conf.sh
+if [ "${CELERITY_WORKER_IP}" = "" ]; then
+	CELERITY_WORKER_IP=$(ip addr show | grep inet | grep -v 127 | grep -v ":" | awk -F " " '{print$2}' | awk -F "/" '{print$1}')
+	sed -i "s@^CELERITY_CELERITY_WORKER_IP=.*@CELERITY_CELERITY_WORKER_IP='${CELERITY_WORKER_IP}'@" /root/envsetup/conf.sh
+fi