diff --git a/Dockerfile b/Dockerfile
index 92c9e8c..456b0cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,4 +8,3 @@ RUN dotnet publish -c Release -o out
 
 WORKDIR /build/out
 ENTRYPOINT ["dotnet", "Opc.Ua.Publisher.dll"]
-
diff --git a/Dockerfile.Windows b/Dockerfile.Windows
index bed813f..c5aa081 100644
--- a/Dockerfile.Windows
+++ b/Dockerfile.Windows
@@ -1,14 +1,10 @@
 FROM microsoft/dotnet:1.1-sdk-nanoserver
 
-COPY / /build
+COPY /src /build
 
 WORKDIR /build
 RUN dotnet restore
+RUN dotnet publish -c Release -o out
 
-WORKDIR /build/src/GatewayApp.NetCore
-RUN dotnet publish -c Debug -f netcoreapp1.1 -r win10-x64 -o bin/Debug/netcoreapp1.1
-
-WORKDIR /build/src/GatewayApp.NetCore/bin/Debug/netcoreapp1.1
-RUN dir
-ENV PATH=/build/src/GatewayApp.NetCore/bin/Debug/netcoreapp1.1
-ENTRYPOINT ["./GatewayApp.NetCore"]
\ No newline at end of file
+WORKDIR /build/out
+ENTRYPOINT ["dotnet", "Opc.Ua.Publisher.dll"]
diff --git a/src/Opc.Ua.Publisher.sln b/src/Opc.Ua.Publisher.sln
index 2edaf92..1eb2ed6 100644
--- a/src/Opc.Ua.Publisher.sln
+++ b/src/Opc.Ua.Publisher.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.travis.yml = ..\.travis.yml
 		..\appveyor.yml = ..\appveyor.yml
 		..\Dockerfile = ..\Dockerfile
+		..\Dockerfile.Windows = ..\Dockerfile.Windows
 		..\License.txt = ..\License.txt
 		..\README.md = ..\README.md
 	EndProjectSection