diff --git a/geant_service_orchestrator/products/__init__.py b/geant_service_orchestrator/products/__init__.py
index abbeb292f7cc785c0c725ef986ee98a5dc3f3a47..7b04dc8f26a0b8087a5011e919fbf9ce8e75c31e 100644
--- a/geant_service_orchestrator/products/__init__.py
+++ b/geant_service_orchestrator/products/__init__.py
@@ -1,19 +1,10 @@
 from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
 
-from geant_service_orchestrator.products.product_types.trunk \
-    import Trunk
-from geant_service_orchestrator.products.product_types.trunk_config \
-    import TrunkConfig
-from geant_service_orchestrator.products.product_types.trunk_config_common \
-    import TrunkConfigCommon
-from geant_service_orchestrator.products.product_types.trunk_config_side \
-    import TrunkConfigSide
+from products.product_types.device import Device
 
 SUBSCRIPTION_MODEL_REGISTRY.update(
     {
-        "Trunk": Trunk,
-        "Trunk Config": TrunkConfig,
-        "Trunk Config Common": TrunkConfigCommon,
-        "Trunk Config Side": TrunkConfigSide,
+        "Router": Device,
+        "Switch": Device,
     }
 )