diff --git a/bitwarden-core.sln b/bitwarden-core.sln
index 1a53a6172..f1d34eb4c 100644
--- a/bitwarden-core.sln
+++ b/bitwarden-core.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}"
 EndProject
diff --git a/build.sh b/build.sh
index 57b21f79e..b7e9f8a2c 100644
--- a/build.sh
+++ b/build.sh
@@ -5,31 +5,20 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 echo ""
 
-if [ $# -gt 0 -a "$1" == "push" ]
+if [ $# -gt 1 -a "$1" == "push" ]
 then
-    echo "Pushing bitwarden"
-    echo "================="
+    TAG=$2
+
+    echo "Pushing bitwarden ($TAG)"
+    echo "========================"
     
-    if [ $# -gt 1 ]
-    then
-        TAG=$2
-        
-        docker push bitwarden/api:$TAG
-        docker push bitwarden/identity:$TAG
-        docker push bitwarden/server:$TAG
-        docker push bitwarden/attachments:$TAG
-        docker push bitwarden/nginx:$TAG
-        docker push bitwarden/mssql:$TAG
-        docker push bitwarden/setup:$TAG
-    else
-        docker push bitwarden/api
-        docker push bitwarden/identity
-        docker push bitwarden/server
-        docker push bitwarden/attachments
-        docker push bitwarden/nginx
-        docker push bitwarden/mssql
-        docker push bitwarden/setup
-    fi
+    docker push bitwarden/api:$TAG
+    docker push bitwarden/identity:$TAG
+    docker push bitwarden/server:$TAG
+    docker push bitwarden/attachments:$TAG
+    docker push bitwarden/nginx:$TAG
+    docker push bitwarden/mssql:$TAG
+    docker push bitwarden/setup:$TAG
 elif [ $# -gt 1 -a "$1" == "tag" ]
 then
     TAG=$2