diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..df2e0fe
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.dockerignore
+.env
+.git
+.gitignore
+.vs
+.vscode
+*/bin
+*/obj
+**/.toolstarget
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..c62033b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,27 @@
+version: '3'
+
+services:
+  eshopwebrazor:
+    image: eshopwebrazor
+    build:
+      context: .
+      dockerfile: src/WebRazorPages/Dockerfile
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "5107:5107"
+
+  eshopwebmvc:
+    image: eshopwebmvc
+    build:
+      context: .
+      dockerfile: src/Web/Dockerfile
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "5106:5106"
+
+networks:
+  default:
+    external:
+      name: nat
\ No newline at end of file
diff --git a/src/Web/Dockerfile b/src/Web/Dockerfile
new file mode 100644
index 0000000..bb1a758
--- /dev/null
+++ b/src/Web/Dockerfile
@@ -0,0 +1,19 @@
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/aspnetcore-build:2.1.300-preview1 AS build
+RUN npm install -g bower@1.8.4
+WORKDIR /src
+COPY . .
+WORKDIR /src/src/Web
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "Web.dll"]
diff --git a/src/Web/Startup.cs b/src/Web/Startup.cs
index b4f1b02..1ca717b 100644
--- a/src/Web/Startup.cs
+++ b/src/Web/Startup.cs
@@ -119,7 +119,6 @@ namespace Microsoft.eShopWeb
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseBrowserLink();
                 ListAllRegisteredServices(app);
                 app.UseDatabaseErrorPage();
             }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 6780c6a..d91d29e 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.0-rc1-final" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0-rc1-final" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0-preview1-final" />  </ItemGroup>
+    </ItemGroup>
   <ItemGroup>
     <Folder Include="Views\Catalog\" />
     <Folder Include="wwwroot\fonts\" />
diff --git a/src/WebRazorPages/Dockerfile b/src/WebRazorPages/Dockerfile
new file mode 100644
index 0000000..83d110b
--- /dev/null
+++ b/src/WebRazorPages/Dockerfile
@@ -0,0 +1,19 @@
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/aspnetcore-build:2.1.300-preview1 AS build
+RUN npm install -g bower@1.8.4
+WORKDIR /src
+COPY . .
+WORKDIR /src/src/WebRazorPages
+RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet build --no-restore -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish --no-restore -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "Microsoft.eShopWeb.RazorPages.dll"]
diff --git a/src/WebRazorPages/Program.cs b/src/WebRazorPages/Program.cs
index e66d201..a9e9567 100644
--- a/src/WebRazorPages/Program.cs
+++ b/src/WebRazorPages/Program.cs
@@ -41,7 +41,7 @@ namespace Microsoft.eShopWeb.RazorPages
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseUrls("http://0.0.0.0:5106")
+                .UseUrls("http://0.0.0.0:5107")
                 .UseStartup<Startup>();
     }
 }
diff --git a/src/WebRazorPages/Properties/launchSettings.json b/src/WebRazorPages/Properties/launchSettings.json
index 1c92721..da89f3e 100644
--- a/src/WebRazorPages/Properties/launchSettings.json
+++ b/src/WebRazorPages/Properties/launchSettings.json
@@ -22,6 +22,11 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:28656/"
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://localhost:{ServicePort}"
     }
   }
 }
\ No newline at end of file
diff --git a/src/WebRazorPages/Startup.cs b/src/WebRazorPages/Startup.cs
index 892cafd..09d1cf4 100644
--- a/src/WebRazorPages/Startup.cs
+++ b/src/WebRazorPages/Startup.cs
@@ -124,7 +124,6 @@ namespace Microsoft.eShopWeb.RazorPages
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseBrowserLink();
                 ListAllRegisteredServices(app);
                 app.UseDatabaseErrorPage();
             }
diff --git a/src/WebRazorPages/WebRazorPages.csproj b/src/WebRazorPages/WebRazorPages.csproj
index 71cc33b..7fea95c 100644
--- a/src/WebRazorPages/WebRazorPages.csproj
+++ b/src/WebRazorPages/WebRazorPages.csproj
@@ -3,10 +3,11 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Microsoft.eShopWeb.RazorPages</RootNamespace>
     <AssemblyName>Microsoft.eShopWeb.RazorPages</AssemblyName>
+    <DockerTargetOS>Linux</DockerTargetOS>
+    <UserSecretsId>231ddc1b-6787-4704-a0c0-18df6a022660</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0-preview1-final" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />