diff --git a/src/Admin/build.sh b/src/Admin/build.sh
old mode 100644
new mode 100755
index 7be1a0713..7501ca866
--- a/src/Admin/build.sh
+++ b/src/Admin/build.sh
@@ -9,6 +9,9 @@ echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
 echo "Clean"
 dotnet clean $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
+echo "Node Build"
+npm --prefix $DIR install $DIR
+gulp --gulpfile $DIR/gulpfile.js build
 echo "Publish"
 dotnet publish $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
 
diff --git a/util/Setup/NginxConfigBuilder.cs b/util/Setup/NginxConfigBuilder.cs
index 166b01330..20fca628d 100644
--- a/util/Setup/NginxConfigBuilder.cs
+++ b/util/Setup/NginxConfigBuilder.cs
@@ -194,8 +194,8 @@ server {{
     proxy_pass http://icons/;
   }}
 
-  location /admin/ {{
-    proxy_pass http://admin:5000/admin/;
+  location /admin {{
+    proxy_pass http://admin:5000;
   }}
 }}");
             }