diff --git a/deploy-dashboard.sh b/deploy-dashboard.sh
index 71f545e..60ec9f4 100644
--- a/deploy-dashboard.sh
+++ b/deploy-dashboard.sh
@@ -109,12 +109,12 @@ else
         # Populate the DASHBOARD_LOCATION variable
         DASHBOARD_LOCATION=$(<$HD/Deploy_Saleor/resources/saleor-dashboard/dashboard-location)
         # Modify the new server block
-        sudo sed -i "s|{dashboard-location}|$DASHBOARD_LOCATION|" /etc/nginx/sites-available/saleor
+        sudo sed -i "s#{dashboard-location}#$DASHBOARD_LOCATION#" /etc/nginx/sites-available/saleor
         wait
         # Modify the new server block again
         sudo sed -i "s|{hd}|$HD|g
-                     s/{app_mount_uri}/$APP_MOUNT_URI/g
-                     s/{host}/$HOST/g" $HD/Deploy_Saleor/resources/saleor-dashboard/server
+                     s|{app_mount_uri}|$APP_MOUNT_URI|g
+                     s|{host}|$HOST|g" $HD/Deploy_Saleor/resources/saleor-dashboard/server
         wait
         echo "Enabling server block and Restarting nginx..."
         sudo ln -s /etc/nginx/sites-available/saleor /etc/nginx/sites-enabled/
diff --git a/deploy-saleor.sh b/deploy-saleor.sh
index 2080cfd..e57aa61 100644
--- a/deploy-saleor.sh
+++ b/deploy-saleor.sh
@@ -462,7 +462,7 @@ fi
 if [ "vOPT" = "true" ] || [ "$REPO" = "mirumee" ]; then
         # Create the saleor service file
         sudo sed "s/{un}/$UN/
-                  s|{hd}|$HD|" $HD/Deploy_Saleor/resources/saleor/template.service > /etc/systemd/system/saleor.service
+                  s|{hd}|$HD|g" $HD/Deploy_Saleor/resources/saleor/template.service > /etc/systemd/system/saleor.service
         wait
         # Does an old server block exist?
         if [ -f "/etc/nginx/sites-available/saleor" ]; then
@@ -480,7 +480,7 @@ if [ "vOPT" = "true" ] || [ "$REPO" = "mirumee" ]; then
 else
         # Create the new service file
         sudo sed "s/{un}/$UN/
-                  s|{hd}|$HD|" $HD/Deploy_Saleor/resources/saleor/template.service > /etc/systemd/system/saleor.service
+                  s|{hd}|$HD|g" $HD/Deploy_Saleor/resources/saleor/template.service > /etc/systemd/system/saleor.service
         wait
         # Does an old server block exist?
         if [ -f "/etc/nginx/sites-available/saleor" ]; then
diff --git a/resources/saleor/template.uwsgi b/resources/saleor/template.uwsgi
index c7437f7..4857e2a 100644
--- a/resources/saleor/template.uwsgi
+++ b/resources/saleor/template.uwsgi
@@ -16,7 +16,7 @@ ignore-sigpipe          = true
 ignore-write-errors     = true
 disable-write-exception = true
 # Modifications
-socket                  = {hd}/saleor/saleor.sock
+socket                  = {hd}/run/saleor.sock
 # socket permissions
 chown-socket            = {un}:www-data
 chmod-socket            = 660