diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
index 782734c8c8b..33b8db99bb3 100644
--- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
@@ -1255,7 +1255,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
         serviceProviderMap.put(Service.Dhcp, routerProvider);
         serviceProviderMap.put(Service.Dns, routerProvider);
         serviceProviderMap.put(Service.UserData, routerProvider);
-        serviceProviderMap.put(Service.Vpn, routerProvider);
         if (forVpc) {
             serviceProviderMap.put(Service.NetworkACL, provider);
         } else {
@@ -1266,6 +1265,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
             serviceProviderMap.put(Service.StaticNat, provider);
             serviceProviderMap.put(Service.PortForwarding, provider);
             serviceProviderMap.put(Service.Lb, provider);
+            if (provider == Provider.Netris) {
+                serviceProviderMap.put(Service.Vpn, routerProvider);
+            }
         }
         return serviceProviderMap;
     }