diff --git a/templates/Angular2Spa/Dockerfile b/templates/Angular2Spa/Dockerfile
index c9bf07c..9a184fa 100644
--- a/templates/Angular2Spa/Dockerfile
+++ b/templates/Angular2Spa/Dockerfile
@@ -1,17 +1,16 @@
-FROM microsoft/dotnet:1.0.0-preview2-onbuild
+FROM microsoft/dotnet:1.1.0-sdk-projectjson
 
 RUN apt-get update
 RUN wget -qO- https://deb.nodesource.com/setup_4.x | bash -
 RUN apt-get install -y build-essential nodejs
 
+COPY . /app
+
 WORKDIR /app
 
-COPY project.json .
 RUN ["dotnet", "restore"]
-
-COPY . /app
 RUN ["dotnet", "build"]
 
 EXPOSE 5000/tcp
 
-ENTRYPOINT ["dotnet", "run", "--server.urls", "http://0.0.0.0:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]
diff --git a/templates/AureliaSpa/Dockerfile b/templates/AureliaSpa/Dockerfile
index c9bf07c..9a184fa 100644
--- a/templates/AureliaSpa/Dockerfile
+++ b/templates/AureliaSpa/Dockerfile
@@ -1,17 +1,16 @@
-FROM microsoft/dotnet:1.0.0-preview2-onbuild
+FROM microsoft/dotnet:1.1.0-sdk-projectjson
 
 RUN apt-get update
 RUN wget -qO- https://deb.nodesource.com/setup_4.x | bash -
 RUN apt-get install -y build-essential nodejs
 
+COPY . /app
+
 WORKDIR /app
 
-COPY project.json .
 RUN ["dotnet", "restore"]
-
-COPY . /app
 RUN ["dotnet", "build"]
 
 EXPOSE 5000/tcp
 
-ENTRYPOINT ["dotnet", "run", "--server.urls", "http://0.0.0.0:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]
diff --git a/templates/KnockoutSpa/Dockerfile b/templates/KnockoutSpa/Dockerfile
index b462012..9a184fa 100644
--- a/templates/KnockoutSpa/Dockerfile
+++ b/templates/KnockoutSpa/Dockerfile
@@ -1,17 +1,16 @@
-FROM microsoft/dotnet:latest
+FROM microsoft/dotnet:1.1.0-sdk-projectjson
 
 RUN apt-get update
 RUN wget -qO- https://deb.nodesource.com/setup_4.x | bash -
 RUN apt-get install -y build-essential nodejs
 
+COPY . /app
+
 WORKDIR /app
 
-COPY project.json .
 RUN ["dotnet", "restore"]
-
-COPY . /app
 RUN ["dotnet", "build"]
 
 EXPOSE 5000/tcp
 
-ENTRYPOINT ["dotnet", "run", "--server.urls", "http://0.0.0.0:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]
diff --git a/templates/ReactReduxSpa/Dockerfile b/templates/ReactReduxSpa/Dockerfile
index b462012..9a184fa 100644
--- a/templates/ReactReduxSpa/Dockerfile
+++ b/templates/ReactReduxSpa/Dockerfile
@@ -1,17 +1,16 @@
-FROM microsoft/dotnet:latest
+FROM microsoft/dotnet:1.1.0-sdk-projectjson
 
 RUN apt-get update
 RUN wget -qO- https://deb.nodesource.com/setup_4.x | bash -
 RUN apt-get install -y build-essential nodejs
 
+COPY . /app
+
 WORKDIR /app
 
-COPY project.json .
 RUN ["dotnet", "restore"]
-
-COPY . /app
 RUN ["dotnet", "build"]
 
 EXPOSE 5000/tcp
 
-ENTRYPOINT ["dotnet", "run", "--server.urls", "http://0.0.0.0:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]
diff --git a/templates/ReactSpa/Dockerfile b/templates/ReactSpa/Dockerfile
index b462012..9a184fa 100644
--- a/templates/ReactSpa/Dockerfile
+++ b/templates/ReactSpa/Dockerfile
@@ -1,17 +1,16 @@
-FROM microsoft/dotnet:latest
+FROM microsoft/dotnet:1.1.0-sdk-projectjson
 
 RUN apt-get update
 RUN wget -qO- https://deb.nodesource.com/setup_4.x | bash -
 RUN apt-get install -y build-essential nodejs
 
+COPY . /app
+
 WORKDIR /app
 
-COPY project.json .
 RUN ["dotnet", "restore"]
-
-COPY . /app
 RUN ["dotnet", "build"]
 
 EXPOSE 5000/tcp
 
-ENTRYPOINT ["dotnet", "run", "--server.urls", "http://0.0.0.0:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]
diff --git a/templates/WebApplicationBasic/Dockerfile b/templates/WebApplicationBasic/Dockerfile
index 134c714..c13b5b8 100644
--- a/templates/WebApplicationBasic/Dockerfile
+++ b/templates/WebApplicationBasic/Dockerfile
@@ -1,13 +1,12 @@
-FROM microsoft/dotnet:latest
+FROM microsoft/dotnet:1.1.0-sdk-projectjson
+
+COPY . /app
 
 WORKDIR /app
 
-COPY project.json .
 RUN ["dotnet", "restore"]
-
-COPY . /app
 RUN ["dotnet", "build"]
 
 EXPOSE 5000/tcp
 
-ENTRYPOINT ["dotnet", "run", "--server.urls", "http://0.0.0.0:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]