diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
index f27be8711c..db103a1cbf
--- a/build.sh
+++ b/build.sh
@@ -11,7 +11,7 @@ then
 
     echo "Pushing Bitwarden ($TAG)"
     echo "========================"
-    
+
     docker push bitwarden/api:$TAG
     docker push bitwarden/identity:$TAG
     docker push bitwarden/server:$TAG
@@ -26,9 +26,9 @@ then
 elif [ $# -gt 1 -a "$1" == "tag" ]
 then
     TAG=$2
-    
+
     echo "Tagging Bitwarden as '$TAG'"
-    
+
     docker tag bitwarden/api bitwarden/api:$TAG
     docker tag bitwarden/identity bitwarden/identity:$TAG
     docker tag bitwarden/server bitwarden/server:$TAG
@@ -44,36 +44,36 @@ else
     echo "Building Bitwarden"
     echo "=================="
 
-    chmod u+x $DIR/src/Api/build.sh
-    $DIR/src/Api/build.sh
+    chmod u+x "$DIR/src/Api/build.sh"
+    "$DIR/src/Api/build.sh"
 
-    chmod u+x $DIR/src/Identity/build.sh
-    $DIR/src/Identity/build.sh
+    chmod u+x "$DIR/src/Identity/build.sh"
+    "$DIR/src/Identity/build.sh"
 
-    chmod u+x $DIR/util/Server/build.sh
-    $DIR/util/Server/build.sh
+    chmod u+x "$DIR/util/Server/build.sh"
+    "$DIR/util/Server/build.sh"
 
-    chmod u+x $DIR/util/Nginx/build.sh
-    $DIR/util/Nginx/build.sh
+    chmod u+x "$DIR/util/Nginx/build.sh"
+    "$DIR/util/Nginx/build.sh"
 
-    chmod u+x $DIR/util/Attachments/build.sh
-    $DIR/util/Attachments/build.sh
+    chmod u+x "$DIR/util/Attachments/build.sh"
+    "$DIR/util/Attachments/build.sh"
 
-    chmod u+x $DIR/src/Icons/build.sh
-    $DIR/src/Icons/build.sh
+    chmod u+x "$DIR/src/Icons/build.sh"
+    "$DIR/src/Icons/build.sh"
 
-    chmod u+x $DIR/src/Notifications/build.sh
-    $DIR/src/Notifications/build.sh
+    chmod u+x "$DIR/src/Notifications/build.sh"
+    "$DIR/src/Notifications/build.sh"
 
-    chmod u+x $DIR/src/Events/build.sh
-    $DIR/src/Events/build.sh
+    chmod u+x "$DIR/src/Events/build.sh"
+    "$DIR/src/Events/build.sh"
 
-    chmod u+x $DIR/src/Admin/build.sh
-    $DIR/src/Admin/build.sh
+    chmod u+x "$DIR/src/Admin/build.sh"
+    "$DIR/src/Admin/build.sh"
 
-    chmod u+x $DIR/util/MsSql/build.sh
-    $DIR/util/MsSql/build.sh
+    chmod u+x "$DIR/util/MsSql/build.sh"
+    "$DIR/util/MsSql/build.sh"
 
-    chmod u+x $DIR/util/Setup/build.sh
-    $DIR/util/Setup/build.sh
+    chmod u+x "$DIR/util/Setup/build.sh"
+    "$DIR/util/Setup/build.sh"
 fi
diff --git a/src/Admin/build.sh b/src/Admin/build.sh
index 5c82493368..e7ec75c81b 100755
--- a/src/Admin/build.sh
+++ b/src/Admin/build.sh
@@ -9,17 +9,17 @@ echo -e "\n## Building Admin"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Admin.csproj
+dotnet restore "$DIR/Admin.csproj"
 echo "Clean"
-dotnet clean $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Node Build"
-cd $DIR
+cd "$DIR"
 npm install
-cd $CUR_DIR
-gulp --gulpfile $DIR/gulpfile.js build
+cd "$CUR_DIR"
+gulp --gulpfile "$DIR/gulpfile.js" build
 echo "Publish"
-dotnet publish $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/admin $DIR/.
+docker build -t bitwarden/admin "$DIR/."
diff --git a/src/Api/build.sh b/src/Api/build.sh
index 905e69d192..87ab26a013 100755
--- a/src/Api/build.sh
+++ b/src/Api/build.sh
@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
 set -e
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && "pwd" )"
 
 echo -e "\n## Building API"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Api.csproj
+dotnet restore "$DIR/Api.csproj"
 echo "Clean"
-dotnet clean $DIR/Api.csproj -c "Release" -o $DIR/obj/Docker/publish/Api
+dotnet clean "$DIR/Api.csproj" -c "Release" -o "$DIR/obj/Docker/publish/Api"
 echo "Publish"
-dotnet publish $DIR/Api.csproj -c "Release" -o $DIR/obj/Docker/publish/Api
+dotnet publish "$DIR/Api.csproj" -c "Release" -o "$DIR/obj/Docker/publish/Api"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/api $DIR/.
+docker build -t bitwarden/api "$DIR/."
diff --git a/src/Events/build.sh b/src/Events/build.sh
old mode 100644
new mode 100755
index 5f0c30a989..73ca362b25
--- a/src/Events/build.sh
+++ b/src/Events/build.sh
@@ -8,12 +8,12 @@ echo -e "\n## Building Events"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Events.csproj
+dotnet restore "$DIR/Events.csproj"
 echo "Clean"
-dotnet clean $DIR/Events.csproj -c "Release" -o $DIR/obj/Docker/publish/Events
+dotnet clean "$DIR/Events.csproj" -c "Release" -o "$DIR/obj/Docker/publish/Events"
 echo "Publish"
-dotnet publish $DIR/Events.csproj -c "Release" -o $DIR/obj/Docker/publish/Events
+dotnet publish "$DIR/Events.csproj" -c "Release" -o "$DIR/obj/Docker/publish/Events"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/events $DIR/.
+docker build -t bitwarden/events "$DIR/."
diff --git a/src/EventsProcessor/build.sh b/src/EventsProcessor/build.sh
index fda9d6f098..afdc090d80 100644
--- a/src/EventsProcessor/build.sh
+++ b/src/EventsProcessor/build.sh
@@ -8,15 +8,15 @@ echo -e "\n## Building Event Processor"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/EventsProcessor.csproj
+dotnet restore "$DIR/EventsProcessor.csproj"
 echo "Clean"
-dotnet clean $DIR/EventsProcessor.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/EventsProcessor.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Publish"
-dotnet publish $DIR/EventsProcessor.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/EventsProcessor.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 if [ "$1" != "nodocker" ]
 then
     echo -e "\nBuilding docker image"
     docker --version
-    docker build -t bitwarden/icons $DIR/.
+    docker build -t bitwarden/icons "$DIR/."
 fi
diff --git a/src/Icons/build.sh b/src/Icons/build.sh
index 1e069c997c..578ff60ffb 100755
--- a/src/Icons/build.sh
+++ b/src/Icons/build.sh
@@ -8,15 +8,15 @@ echo -e "\n## Building Icons"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Icons.csproj
+dotnet restore "$DIR/Icons.csproj"
 echo "Clean"
-dotnet clean $DIR/Icons.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/Icons.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Publish"
-dotnet publish $DIR/Icons.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/Icons.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 if [ "$1" != "nodocker" ]
 then
     echo -e "\nBuilding docker image"
     docker --version
-    docker build -t bitwarden/icons $DIR/.
+    docker build -t bitwarden/icons "$DIR/."
 fi
diff --git a/src/Identity/build.sh b/src/Identity/build.sh
index 0fa8f11f56..1e24204689 100755
--- a/src/Identity/build.sh
+++ b/src/Identity/build.sh
@@ -8,12 +8,12 @@ echo -e "\n## Building Identity"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Identity.csproj
+dotnet restore "$DIR/Identity.csproj"
 echo "Clean"
-dotnet clean $DIR/Identity.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/Identity.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Publish"
-dotnet publish $DIR/Identity.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/Identity.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/identity $DIR/.
+docker build -t bitwarden/identity "$DIR/."
diff --git a/src/Notifications/build.sh b/src/Notifications/build.sh
old mode 100644
new mode 100755
index 28082e604d..0ffc6cb925
--- a/src/Notifications/build.sh
+++ b/src/Notifications/build.sh
@@ -8,15 +8,15 @@ echo -e "\n## Building Notifications"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Notifications.csproj
+dotnet restore "$DIR/Notifications.csproj"
 echo "Clean"
-dotnet clean $DIR/Notifications.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/Notifications.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Publish"
-dotnet publish $DIR/Notifications.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/Notifications.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 if [ "$1" != "nodocker" ]
 then
     echo -e "\nBuilding docker image"
     docker --version
-    docker build -t bitwarden/notifications $DIR/.
+    docker build -t bitwarden/notifications "$DIR/."
 fi
diff --git a/util/Attachments/build.sh b/util/Attachments/build.sh
index a5299c99cc..ef9ed67e67 100755
--- a/util/Attachments/build.sh
+++ b/util/Attachments/build.sh
@@ -7,4 +7,4 @@ echo -e "\n## Building Attachments"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/attachments $DIR/.
+docker build -t bitwarden/attachments "$DIR/."
diff --git a/util/MsSql/build.sh b/util/MsSql/build.sh
index 9dc387b677..f838a89d82 100755
--- a/util/MsSql/build.sh
+++ b/util/MsSql/build.sh
@@ -7,4 +7,4 @@ echo -e "\n## Building MsSql"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/mssql $DIR/.
+docker build -t bitwarden/mssql "$DIR/."
diff --git a/util/Nginx/build.sh b/util/Nginx/build.sh
index 2856d9c83b..613603090f 100755
--- a/util/Nginx/build.sh
+++ b/util/Nginx/build.sh
@@ -7,4 +7,4 @@ echo -e "\n## Building Nginx"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/nginx $DIR/.
+docker build -t bitwarden/nginx "$DIR/."
diff --git a/util/Server/build.sh b/util/Server/build.sh
index deadb87f7e..6b82e8ee99 100755
--- a/util/Server/build.sh
+++ b/util/Server/build.sh
@@ -8,12 +8,12 @@ echo -e "\n## Building Server"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Server.csproj
+dotnet restore "$DIR/Server.csproj"
 echo "Clean"
-dotnet clean $DIR/Server.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/Server.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Publish"
-dotnet publish $DIR/Server.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/Server.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/server $DIR/.
+docker build -t bitwarden/server "$DIR/."
diff --git a/util/Setup/build.sh b/util/Setup/build.sh
index 9c65cdb9e2..c6292b19b7 100755
--- a/util/Setup/build.sh
+++ b/util/Setup/build.sh
@@ -8,12 +8,12 @@ echo -e "\n## Building Setup"
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Restore"
-dotnet restore $DIR/Setup.csproj
+dotnet restore "$DIR/Setup.csproj"
 echo "Clean"
-dotnet clean $DIR/Setup.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet clean "$DIR/Setup.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 echo "Publish"
-dotnet publish $DIR/Setup.csproj -c "Release" -o $DIR/obj/Docker/publish
+dotnet publish "$DIR/Setup.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
 
 echo -e "\nBuilding docker image"
 docker --version
-docker build -t bitwarden/setup $DIR/.
+docker build -t bitwarden/setup "$DIR/."