diff --git a/README.md b/README.md
index cb6319a..9b79e56 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ Hopefully this will help you to get up and running with Sitecore and Docker. By
 # Requirements
 - Windows 10 update 1803 (with Hyper-V enabled)
 - Docker for Windows (version 1712 or better): https://docs.docker.com/docker-for-windows/
-- Visual Studio 15.5.3
 - Sitecore installation files
 
 # Build
diff --git a/docker-compose.yml b/docker-compose.yml
index 09353c7..0ee925f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '2.2'
 
 services:
  mssql:
+  image: sitecore-docker_mssql
   build:
     context: ./
     dockerfile: ./mssql/Dockerfile
@@ -21,6 +22,7 @@ services:
 
  sitecore:
   build:
+    image: sitecore-docker_sitecore
     context: ./
     dockerfile: ./sitecore/Dockerfile
     args:
@@ -43,6 +45,7 @@ services:
       ipv4_address: 172.16.1.3    
 
  solr:
+  image: sitecore-docker_solr
   build:
     context: ./
     dockerfile: ./solr/Dockerfile
@@ -61,6 +64,7 @@ services:
       ipv4_address: 172.16.1.4
 
  xconnect:
+  image: sitecore-docker_xconnect
   build:
     context: ./
     dockerfile: ./xconnect/Dockerfile
diff --git a/files/sitecore-rocks/Sitecore.Rocks.Server.dll b/files/sitecore-rocks/Sitecore.Rocks.Server.dll
new file mode 100644
index 0000000..7bf9172
Binary files /dev/null and b/files/sitecore-rocks/Sitecore.Rocks.Server.dll differ
diff --git a/files/sitecore-rocks/WebService/Browse.aspx b/files/sitecore-rocks/WebService/Browse.aspx
new file mode 100644
index 0000000..8f50fe4
--- /dev/null
+++ b/files/sitecore-rocks/WebService/Browse.aspx
@@ -0,0 +1,51 @@
+<%@ Page Language="C#" %>
+<script runat="server">
+
+    public bool IsLoggedIn()
+    {
+        return Sitecore.Context.User.Identity.IsAuthenticated && Sitecore.Web.Authentication.TicketManager.IsCurrentTicketValid();
+    }
+
+</script>
+<%
+    var username = Request.QueryString["u"] ?? string.Empty;
+    var password = Request.QueryString["p"] ?? string.Empty;
+    var redirect = Request.QueryString["r"] ?? string.Empty;
+
+    var isLoggedIn = false;
+    try
+    {
+        isLoggedIn = IsLoggedIn();
+    }
+    catch (MissingMethodException)
+    {
+        isLoggedIn = Sitecore.Context.User.Identity.IsAuthenticated;
+    }
+
+    if (isLoggedIn)
+    {
+        Sitecore.Web.WebUtil.Redirect(redirect);
+        return;
+    }
+
+    var args1 = new Sitecore.Pipelines.LoggingIn.LoggingInArgs();
+    args1.Username = username;
+    args1.Password = password;
+    args1.StartUrl = redirect;
+
+    Sitecore.Pipelines.Pipeline.Start("loggingin", args1);
+    if (!args1.Success)
+    {
+        Sitecore.Web.WebUtil.Redirect(redirect);
+        return;
+    }
+
+    var args2 = new Sitecore.Pipelines.LoggedIn.LoggedInArgs();
+    args2.Username = username;
+    args2.StartUrl = redirect;
+    args2.Persist = false;
+
+    Sitecore.Pipelines.Pipeline.Start("loggedin", args2);
+
+    Sitecore.Web.WebUtil.Redirect(redirect);
+%>
\ No newline at end of file
diff --git a/files/sitecore-rocks/WebService/Service2.asmx b/files/sitecore-rocks/WebService/Service2.asmx
new file mode 100644
index 0000000..204e6dd
--- /dev/null
+++ b/files/sitecore-rocks/WebService/Service2.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="Service2.asmx.cs" Class="Sitecore.Visual.Service2" %>
diff --git a/files/sitecore-rocks/WebService/Sitecore.Rocks.Validation.ashx b/files/sitecore-rocks/WebService/Sitecore.Rocks.Validation.ashx
new file mode 100644
index 0000000..ce4bdbb
--- /dev/null
+++ b/files/sitecore-rocks/WebService/Sitecore.Rocks.Validation.ashx
@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="Sitecore.Rocks.Validation.ashx.cs" Class="Sitecore.Rocks.Server.WebService.ValidationHandler" %>
diff --git a/sitecore/Dockerfile b/sitecore/Dockerfile
index 35585e0..70454bb 100644
--- a/sitecore/Dockerfile
+++ b/sitecore/Dockerfile
@@ -119,6 +119,10 @@ RUN Copy-Item /Config/*.* c:\inetpub\wwwroot\$Env:SITE_NAME\App_Config\Include
 # enable live-mode
 RUN mv C:\inetpub\wwwroot\sitecore\App_Config\Include\Examples\LiveMode.config.example C:\inetpub\wwwroot\sitecore\App_Config\Include\Examples\LiveMode.config
 
+# copy sitecore rocks files
+COPY files/sitecore-rocks/WebService/* /inetpub/wwwroot/sitecore/sitecore/shell/WebService/
+COPY files/sitecore-rocks/*.dll /inetpub/wwwroot/sitecore/bin/
+
 # Add Host
 RUN /Scripts/Add-Hosts.ps1;