diff --git a/Dockerfile b/Dockerfile
index 5895e284f..7e227a694 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN phantomjs --version
 
 COPY src/Squidex/package.json /tmp/package.json
 
-# Install Node Packages 
+# Install Node packages 
 RUN cd /tmp && npm install
 
 COPY . .
@@ -59,10 +59,12 @@ RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Rel
 #
 FROM microsoft/aspnetcore:1.1.2
 
-# Default AspNet Core Workdir
+# Default AspNetCore directory
 WORKDIR /app
 
-# Copy from Build Stage
+# Copy from nuild stage
 COPY --from=builder /out/ .
 
+EXPOSE 80
+
 ENTRYPOINT ["dotnet", "Squidex.dll"]
\ No newline at end of file
diff --git a/src/Squidex/Dockerfile b/src/Squidex/Dockerfile
index 74d8148fd..1d25b5fc0 100644
--- a/src/Squidex/Dockerfile
+++ b/src/Squidex/Dockerfile
@@ -1,5 +1,9 @@
 FROM microsoft/aspnetcore:1.1.2
+
 WORKDIR /app
+
+# Copy from current directory
 COPY . .
+
 EXPOSE 80
 ENTRYPOINT ["dotnet", "Squidex.dll"]
\ No newline at end of file