diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index e575e6267..e519656af 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -27,10 +27,16 @@ fi
 # Load .env or .env.dist if not present
 if [ -f "$SCRIPT_DIR/.env" ]; then
     # export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs -0)
-    export $(grep -v '^#' $SCRIPT_DIR/.env | xargs -d '\n')
+    # export $(grep -v '^#' $SCRIPT_DIR/.env | xargs -d '\n')
+    set -o allexport
+    source $SCRIPT_DIR/.env
+    set +o allexport
 else
     #export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs -0)
-    export $(grep -v '^#' $SCRIPT_DIR/.env.dist | xargs -d '\n')
+    #export $(grep -v '^#' $SCRIPT_DIR/.env.dist | xargs -d '\n')
+    set -o allexport
+    source $SCRIPT_DIR/.env.dist
+    set +o allexport
 fi
 
 echo $COMMUNITY_DESCRIPTION