diff --git a/build/build_binary_devops.ps1 b/build/build_binary_devops.ps1
index 1a6b90730..6fb257a61 100755
--- a/build/build_binary_devops.ps1
+++ b/build/build_binary_devops.ps1
@@ -6,7 +6,7 @@ param (
 $ErrorActionPreference = "Stop";
 
 $binary = "portainer.exe"
-$go_path = "$($(Get-ITEM -Path env:AGENT_HOMEDIRECTORY).Value)\go"
+$go_path = "$($(Get-ITEM -Path env:AGENT_TEMPDIRECTORY).Value)\go"
 
 Set-Item env:GOPATH "$go_path"
 
@@ -17,7 +17,7 @@ Copy-Item -Path "api" -Destination "$go_path\src\github.com\portainer\portainer\
 
 Set-Location -Path "api\cmd\portainer"
 
-go.exe get -t -d -v ./...
-go.exe build -v
+go get -t -d -v ./...
+go build -v
 
 Move-Item -Path "$($binary)" -Destination "dist"
diff --git a/build/windows/nanoserver/Dockerfile b/build/windows/nanoserver/Dockerfile
deleted file mode 100644
index 36919634c..000000000
--- a/build/windows/nanoserver/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM microsoft/nanoserver
-
-USER ContainerAdministrator
-
-COPY dist /
-
-VOLUME C:\\data
-
-WORKDIR /
-
-EXPOSE 9000
-
-ENTRYPOINT ["/portainer.exe"]
diff --git a/build/windows2016/nanoserver/Dockerfile b/build/windows2016/nanoserver/Dockerfile
index ae8a25a39..d7a18e80c 100644
--- a/build/windows2016/nanoserver/Dockerfile
+++ b/build/windows2016/nanoserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver
+FROM microsoft/nanoserver:sac2016
 
 COPY dist /