diff --git a/backend/.env.template b/backend/.env.template
index b3a5eb4c6..e80ceb231 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -21,10 +21,10 @@ KLICKTIPP_APIKEY_DE=$KLICKTIPP_APIKEY_DE
 KLICKTIPP_APIKEY_EN=$KLICKTIPP_APIKEY_EN
 
 # Community
-COMMUNITY_NAME=$COMMUNITY_NAME
+COMMUNITY_NAME="$COMMUNITY_NAME"
 COMMUNITY_URL=$COMMUNITY_URL
 COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
-COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
+COMMUNITY_DESCRIPTION="$COMMUNITY_DESCRIPTION"
 
 # Login Server
 LOGIN_APP_SECRET=21ffbbc616fe
diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh
index caa9c1240..51b8e9cef 100755
--- a/deployment/bare_metal/install.sh
+++ b/deployment/bare_metal/install.sh
@@ -14,9 +14,13 @@ set +o allexport
 # NOTE: all config values will be in process.env when starting
 # the services and will therefore take precedence over the .env
 if [ -f "$SCRIPT_DIR/.env" ]; then
-    export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs)
+    set -o allexport
+    source $SCRIPT_DIR/.env
+    set +o allexport
 else
-    export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs)
+    set -o allexport
+    source $SCRIPT_DIR/.env.dist
+    set +o allexport
 fi
 
 # Configure git
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index e519656af..616e4b8ab 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -26,26 +26,15 @@ 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')
     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')
     set -o allexport
     source $SCRIPT_DIR/.env.dist
     set +o allexport
 fi
 
-echo $COMMUNITY_DESCRIPTION
-echo $COMMUNITY_NAME
-echo "$COMMUNITY_DESCRIPTION"
-echo "$COMMUNITY_NAME"
-echo "${COMMUNITY_DESCRIPTION}"
-echo "${COMMUNITY_NAME}"
-
 # lock start
 if [ -f $LOCK_FILE ] ; then
   echo "Already building!"