diff --git a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
index 6ba1a194d..f0f1aaf3b 100644
--- a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
@@ -27,7 +27,6 @@ use Combodo\iTop\Portal\DependencyInjection\SilexCompatBootstrap\PortalXmlConfig
 
 // Note: ModuleDesign service is not available yet as this script is processed before service generation,
 // that's why we have to instantiate it manually.
-require_once APPROOT . 'core/moduledesign.class.inc.php';
 $moduleDesign = new \ModuleDesign(PORTAL_ID);
 
 // TODO: The following code needs to be refactored to more independent and atomic services.
diff --git a/datamodels/2.x/itop-portal-base/portal/config/services.yaml b/datamodels/2.x/itop-portal-base/portal/config/services.yaml
index 0b3735e3f..08e1bfe07 100644
--- a/datamodels/2.x/itop-portal-base/portal/config/services.yaml
+++ b/datamodels/2.x/itop-portal-base/portal/config/services.yaml
@@ -88,7 +88,8 @@ services:
 
     # Legacy code as a service: since it is not in the auto-wiring path, it needs to be explicitly declared
     ModuleDesign:
-        class: 'ModuleDesign'
+        public: true
+        class: ModuleDesign
         arguments:
             - '%combodo.portal.instance.id%'