diff --git a/src/Ocelot/DependencyInjection/OcelotBuilder.cs b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
index 3ff2defc..40ac80ed 100644
--- a/src/Ocelot/DependencyInjection/OcelotBuilder.cs
+++ b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
@@ -45,8 +45,9 @@ namespace Ocelot.DependencyInjection
     using Ocelot.Infrastructure.Consul;
     using Butterfly.Client.Tracing;
     using Ocelot.Middleware.Multiplexer;
-    using Pivotal.Discovery.Client;
     using ServiceDiscovery.Providers;
+    using Steeltoe.Common.Discovery;
+    using Pivotal.Discovery.Client;
 
     public class OcelotBuilder : IOcelotBuilder
     {
diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj
index 5bd94b0c..01241f59 100644
--- a/src/Ocelot/Ocelot.csproj
+++ b/src/Ocelot/Ocelot.csproj
@@ -54,8 +54,8 @@
     <PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="Consul" Version="0.7.2.4" />
     <PackageReference Include="Polly" Version="6.0.1" />
-    <PackageReference Include="Pivotal.Discovery.Client" Version="1.1.0" />
     <PackageReference Include="IdentityServer4" Version="2.2.0" />
     <PackageReference Include="Rafty" Version="0.4.3" />
+    <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs b/src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs
index ab78db1b..a9f12701 100644
--- a/src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs
+++ b/src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
     using Values;
 
     public class EurekaServiceDiscoveryProvider : IServiceDiscoveryProvider
diff --git a/src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs b/src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs
index 78612148..5ccc382d 100644
--- a/src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs
+++ b/src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs
@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
 
     public class FakeEurekaDiscoveryClient : IDiscoveryClient
     {
diff --git a/src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs b/src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs
index cd678c4f..3ed38b98 100644
--- a/src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs
+++ b/src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs
@@ -7,9 +7,9 @@ using Ocelot.ServiceDiscovery.Providers;
 using Ocelot.Values;
 
 namespace Ocelot.ServiceDiscovery
-{
-    using Pivotal.Discovery.Client;
-
+{    
+    using Steeltoe.Common.Discovery;
+
     public class ServiceDiscoveryProviderFactory : IServiceDiscoveryProviderFactory
     {
         private readonly IOcelotLoggerFactory _factory;
diff --git a/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs b/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
index 0d5f7d0c..2ec6d945 100644
--- a/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
+++ b/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
@@ -14,7 +14,7 @@ namespace Ocelot.AcceptanceTests
     using TestStack.BDDfy;
     using Xunit;
     using Newtonsoft.Json;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
 
     public class ServiceDiscoveryTests : IDisposable
     {
diff --git a/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs b/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs
index 17f9e3e8..717144b0 100644
--- a/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs
+++ b/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs
@@ -7,6 +7,8 @@ namespace Ocelot.UnitTests.Middleware
     using Ocelot.Middleware.Pipeline;
     using Pivotal.Discovery.Client;
     using Shouldly;
+    using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery.Eureka;
     using TestStack.BDDfy;
     using Xunit;
 
@@ -40,7 +42,16 @@ namespace Ocelot.UnitTests.Middleware
             var root = test.Build();
             var services = new ServiceCollection();
             services.AddSingleton<IConfiguration>(root);
-            services.AddDiscoveryClient(new DiscoveryOptions {ClientType = DiscoveryClientType.EUREKA});
+            services.AddDiscoveryClient(new DiscoveryOptions 
+            {
+                ClientType = DiscoveryClientType.EUREKA,
+                //options can not be null
+                ClientOptions = new EurekaClientOptions()
+                {
+                    ShouldFetchRegistry = false,
+                    ShouldRegisterWithEureka = false
+                }
+            });
             services.AddOcelot();
             var provider = services.BuildServiceProvider();
             _builder = new OcelotPipelineBuilder(provider);
diff --git a/test/Ocelot.UnitTests/ServiceDiscovery/EurekaServiceDiscoveryProviderTests.cs b/test/Ocelot.UnitTests/ServiceDiscovery/EurekaServiceDiscoveryProviderTests.cs
index 0ec071d1..adfb6957 100644
--- a/test/Ocelot.UnitTests/ServiceDiscovery/EurekaServiceDiscoveryProviderTests.cs
+++ b/test/Ocelot.UnitTests/ServiceDiscovery/EurekaServiceDiscoveryProviderTests.cs
@@ -7,6 +7,7 @@
     using Ocelot.ServiceDiscovery.Providers;
     using Pivotal.Discovery.Client;
     using Shouldly;
+    using Steeltoe.Common.Discovery;
     using TestStack.BDDfy;
     using Values;
     using Xunit;
diff --git a/test/Ocelot.UnitTests/ServiceDiscovery/ServiceProviderFactoryTests.cs b/test/Ocelot.UnitTests/ServiceDiscovery/ServiceProviderFactoryTests.cs
index 4621913a..a46369e3 100644
--- a/test/Ocelot.UnitTests/ServiceDiscovery/ServiceProviderFactoryTests.cs
+++ b/test/Ocelot.UnitTests/ServiceDiscovery/ServiceProviderFactoryTests.cs
@@ -13,8 +13,9 @@ using Xunit;
 
 namespace Ocelot.UnitTests.ServiceDiscovery
 {
-    using Pivotal.Discovery.Client;
-
+    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
+
     public class ServiceProviderFactoryTests
     {
         private ServiceProviderConfiguration _serviceConfig;