diff --git a/gso/__init__.py b/gso/__init__.py
index d12e0a772b1979e5536ba232fef4892f66bdc7f3..7239754917e0f67f003219004a04a2b7ca86101b 100644
--- a/gso/__init__.py
+++ b/gso/__init__.py
@@ -1,24 +1,21 @@
 import typer
-from orchestrator import OrchestratorCore
+from orchestrator import OrchestratorCore, app_settings
 from orchestrator.cli.main import app as cli_app
-from orchestrator.settings import AppSettings
 
 import gso.products  # noqa: F401
 import gso.workflows  # noqa: F401
 from gso.api import router as api_router
 from gso.cli import netbox
 
-base_settings = AppSettings()  # TODO check if this is correct
-
 
 def init_gso_app() -> OrchestratorCore:
-    app = OrchestratorCore(base_settings=base_settings)
+    app = OrchestratorCore(base_settings=app_settings)
     app.include_router(api_router, prefix="/api")
     return app
 
 
 def init_worker_app() -> OrchestratorCore:
-    return OrchestratorCore(base_settings=base_settings)
+    return OrchestratorCore(base_settings=app_settings)
 
 
 def init_cli_app() -> typer.Typer: