diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
index e0fc5561c5e..07e807dd3c5 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -373,7 +373,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                     final Map<Service, Set<Provider>> svcProviderMap = new HashMap<Service, Set<Provider>>();
                     final Set<Provider> defaultProviders = Set.of(Provider.Nsx);
                     for (final Service svc : getSupportedServices()) {
-                        if (svc == Service.UserData) {
+                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns).contains(svc)) {
                             final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
                             svcProviderMap.put(svc, userDataProvider);
                         } else {
diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
index 6bcf6d3442b..afa3a0c7e41 100644
--- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
@@ -1000,8 +1000,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
         defaultTungstenSharedSGNetworkOfferingProviders.put(Service.SecurityGroup, Provider.Tungsten);
 
         final Map<Network.Service, Network.Provider> defaultNSXNetworkOfferingProviders = new HashMap<>();
-        defaultNSXNetworkOfferingProviders.put(Service.Dhcp, Provider.Nsx);
-        defaultNSXNetworkOfferingProviders.put(Service.Dns, Provider.Nsx);
+        defaultNSXNetworkOfferingProviders.put(Service.Dhcp, Provider.VPCVirtualRouter);
+        defaultNSXNetworkOfferingProviders.put(Service.Dns, Provider.VPCVirtualRouter);
         defaultNSXNetworkOfferingProviders.put(Service.SourceNat, Provider.Nsx);
         defaultNSXNetworkOfferingProviders.put(Service.UserData, Provider.VPCVirtualRouter);