diff --git a/deploy/yggdrasil b/deploy/yggdrasil
index 47ba0d83b..e4a4d9e90 100755
--- a/deploy/yggdrasil
+++ b/deploy/yggdrasil
@@ -118,7 +118,7 @@ echo 'Creating Epicyon daemon'
   echo "User=$username";
   echo "Group=$username";
   echo "WorkingDirectory=${install_destination}";
-  echo "ExecStart=/usr/bin/python3 ${install_destination}/epicyon.py --http --yggdrasil --bind 0.0.0.0 --port 80 --proxy ${EPICYON_PORT} --domain ${YGGDRASIL_ADDRESS} --registration open";
+  echo "ExecStart=/usr/bin/python3 ${install_destination}/epicyon.py --http --yggdrasil --bind 0.0.0.0 --port 80 --proxy ${EPICYON_PORT} --domain [${YGGDRASIL_ADDRESS}] --registration open";
   echo "Environment=USER=$username";
   echo 'Environment=PYTHONUNBUFFERED=true';
   echo 'Environment=PYTHONIOENCODING=utf-8';
@@ -248,8 +248,8 @@ if [ -f /usr/bin/pacman ]; then
     web_dir=/srv/http
 fi
 
-if [ ! -d /var/www/${YGGDRASIL_ADDRESS}/htdocs ]; then
-	mkdir -p /var/www/${YGGDRASIL_ADDRESS}/htdocs
+if [ ! -d /var/www/[${YGGDRASIL_ADDRESS}]/htdocs ]; then
+	mkdir -p /var/www/[${YGGDRASIL_ADDRESS}]/htdocs
 fi
 
 echo "Creating nginx virtual host for http://[${YGGDRASIL_ADDRESS}]"
@@ -275,7 +275,7 @@ echo "Creating nginx virtual host for http://[${YGGDRASIL_ADDRESS}]"
   echo '    index index.html;';
   echo '';
   echo '    location /newsmirror {';
-  echo "      root /var/www/${YGGDRASIL_ADDRESS}/htdocs;";
+  echo "      root /var/www/[${YGGDRASIL_ADDRESS}]/htdocs;";
   echo '      try_files $uri =404;';
   echo '    }';
   echo '';
@@ -326,7 +326,7 @@ for d in /home/*/ ; do
 done
 
 clear
-echo -n "${YGGDRASIL_ADDRESS}" | qrencode -t ANSI
+echo -n "http://[${YGGDRASIL_ADDRESS}]" | qrencode -t ANSI
 echo 'Your Epicyon yggdrasil instance is now installed.'
 echo ''
 echo 'You can view it in your preferred browser by navigating to:'