diff --git a/samples/OelotKube/ApiGateway/Dockerfile b/samples/OelotKube/ApiGateway/Dockerfile
index 5abcd05a..1ec13d2a 100644
--- a/samples/OelotKube/ApiGateway/Dockerfile
+++ b/samples/OelotKube/ApiGateway/Dockerfile
@@ -1,10 +1,13 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY ["ApiGateway/ApiGateway.csproj", "ApiGateway/"]
+COPY ["../../src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj", "../../src/Ocelot.Provider.Polly/"]
+COPY ["../../src/Ocelot/Ocelot.csproj", "../../src/Ocelot/"]
+COPY ["../../src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj", "../../src/Ocelot.Provider.Kubernetes/"]
 RUN dotnet restore "ApiGateway/ApiGateway.csproj"
 COPY . .
 WORKDIR "/src/ApiGateway"
@@ -16,4 +19,4 @@ RUN dotnet publish "ApiGateway.csproj" -c Release -o /app
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "ApiGateway.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "ApiGateway.dll"]
diff --git a/samples/OelotKube/ApiGateway/ocelot.json b/samples/OelotKube/ApiGateway/ocelot.json
index 7099261c..4830a359 100644
--- a/samples/OelotKube/ApiGateway/ocelot.json
+++ b/samples/OelotKube/ApiGateway/ocelot.json
@@ -1,7 +1,7 @@
 {
   "ReRoutes": [
     {
-      "DownstreamPathTemplate": "/api/Category",
+      "DownstreamPathTemplate": "/api/values",
       "DownstreamScheme": "http",
       "UpstreamPathTemplate": "/Category",
       "ServiceName": "DownstreamService",
@@ -21,7 +21,7 @@
       "Host": "localhost",
       "Port": 8001,
       "Namesapce": "dev",
-      "Type": "k8s"
+      "Type": "kube"
     }
   }
 }
diff --git a/samples/OelotKube/Dockerfile b/samples/OelotKube/Dockerfile
new file mode 100644
index 00000000..1ec13d2a
--- /dev/null
+++ b/samples/OelotKube/Dockerfile
@@ -0,0 +1,22 @@
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM microsoft/dotnet:2.1-sdk AS build
+WORKDIR /src
+COPY ["ApiGateway/ApiGateway.csproj", "ApiGateway/"]
+COPY ["../../src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj", "../../src/Ocelot.Provider.Polly/"]
+COPY ["../../src/Ocelot/Ocelot.csproj", "../../src/Ocelot/"]
+COPY ["../../src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj", "../../src/Ocelot.Provider.Kubernetes/"]
+RUN dotnet restore "ApiGateway/ApiGateway.csproj"
+COPY . .
+WORKDIR "/src/ApiGateway"
+RUN dotnet build "ApiGateway.csproj" -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish "ApiGateway.csproj" -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "ApiGateway.dll"]
diff --git a/samples/OelotKube/DownstreamService/Dockerfile b/samples/OelotKube/DownstreamService/Dockerfile
index baa13993..a9695515 100644
--- a/samples/OelotKube/DownstreamService/Dockerfile
+++ b/samples/OelotKube/DownstreamService/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.2-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 COPY ["DownstreamService/DownstreamService.csproj", "DownstreamService/"]
 RUN dotnet restore "DownstreamService/DownstreamService.csproj"
@@ -16,4 +16,4 @@ RUN dotnet publish "DownstreamService.csproj" -c Release -o /app
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "DownstreamService.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "DownstreamService.dll"]
diff --git a/samples/OelotKube/DownstreamService/Dockerfile.develop b/samples/OelotKube/DownstreamService/Dockerfile.develop
new file mode 100644
index 00000000..6f49a290
--- /dev/null
+++ b/samples/OelotKube/DownstreamService/Dockerfile.develop
@@ -0,0 +1,15 @@
+FROM microsoft/dotnet:2.1-sdk
+ARG BUILD_CONFIGURATION=Debug
+ENV ASPNETCORE_ENVIRONMENT=Development
+ENV DOTNET_USE_POLLING_FILE_WATCHER=true
+EXPOSE 80
+
+WORKDIR /src
+COPY ["DownstreamService/DownstreamService.csproj", "DownstreamService/"]
+
+RUN dotnet restore "DownstreamService/DownstreamService.csproj"
+COPY . .
+WORKDIR "/src/DownstreamService"
+RUN dotnet build --no-restore "DownstreamService.csproj" -c $BUILD_CONFIGURATION
+
+ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]
\ No newline at end of file
diff --git a/samples/OelotKube/OelotKube.sln b/samples/OelotKube/OelotKube.sln
index ed31dc9d..2bb63eff 100644
--- a/samples/OelotKube/OelotKube.sln
+++ b/samples/OelotKube/OelotKube.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Kubernetes"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Polly", "..\..\src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj", "{323055CB-BF62-4A31-A619-A4444B633CDB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DownstreamService", "DownstreamService\DownstreamService.csproj", "{86FFAE3C-648F-4CDE-A260-37C8EBFBF4F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownstreamService", "DownstreamService\DownstreamService.csproj", "{86FFAE3C-648F-4CDE-A260-37C8EBFBF4F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Ocelot.Provider.Kubernetes/KubeProvider.cs b/src/Ocelot.Provider.Kubernetes/KubeProvider.cs
index 72c627de..eb3a23b2 100644
--- a/src/Ocelot.Provider.Kubernetes/KubeProvider.cs
+++ b/src/Ocelot.Provider.Kubernetes/KubeProvider.cs
@@ -10,14 +10,14 @@ using System.Threading.Tasks;
 
 namespace Ocelot.Provider.Kubernetes
 {
-    public class KubeProvider : IServiceDiscoveryProvider
+    public class Kube : IServiceDiscoveryProvider
     {
         private KubeRegistryConfiguration kubeRegistryConfiguration;
         private IOcelotLoggerFactory factory;
         private IKubeApiClient kubeApi;
         private IKubeApiClientFactory kubeClientFactory;
 
-        public KubeProvider(KubeRegistryConfiguration kubeRegistryConfiguration, IOcelotLoggerFactory factory, IKubeApiClientFactory kubeClientFactory)
+        public Kube(KubeRegistryConfiguration kubeRegistryConfiguration, IOcelotLoggerFactory factory, IKubeApiClientFactory kubeClientFactory)
         {
             this.kubeRegistryConfiguration = kubeRegistryConfiguration;
             this.factory = factory;
diff --git a/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs b/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs
index 074e926d..56416ee6 100644
--- a/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs
+++ b/src/Ocelot.Provider.Kubernetes/KubernetesProviderFactory.cs
@@ -11,7 +11,7 @@ namespace Ocelot.Provider.Kubernetes
         public static ServiceDiscoveryFinderDelegate Get = (provider, config, name) =>
         {
             var factory = provider.GetService<IOcelotLoggerFactory>();
-            if (config.Type?.ToLower() == "k8s")
+            if (config.Type?.ToLower() == "kube")
             {
                 return GetkubeProvider(provider, config, name, factory);
             }
@@ -31,7 +31,7 @@ namespace Ocelot.Provider.Kubernetes
                 AllowInsecure = true // Don't validate server certificate
             };
 
-            var k8sServiceDiscoveryProvider = new KubeProvider(k8sRegistryConfiguration, factory, kubeClientFactory);
+            var k8sServiceDiscoveryProvider = new Kube(k8sRegistryConfiguration, factory, kubeClientFactory);
 
             return k8sServiceDiscoveryProvider;
         }