diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 0d517379..0d19e105 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -934,10 +934,10 @@ public function loadSettings(bool $force = false): array
                             'data_size' => strlen(json_encode($softwareCatalogSettings))
                         ]);
 
-                        $importResult = $configurationService->importFromJson(
-                            data: $softwareCatalogSettings,
-                            owner: null,
+                        // Use importFromApp which handles Configuration entity creation automatically
+                        $importResult = $configurationService->importFromApp(
                             appId: \OCA\SoftwareCatalog\AppInfo\Application::APP_ID,
+                            data: $softwareCatalogSettings,
                             version: $currentAppVersion,
                             force: $force
                         );
diff --git a/lib/Settings/softwarecatalogus_register.json b/lib/Settings/softwarecatalogus_register.json
index ad3a815b..08127f08 100644
--- a/lib/Settings/softwarecatalogus_register.json
+++ b/lib/Settings/softwarecatalogus_register.json
@@ -1,4 +1,22 @@
 {
+    "openapi": "3.0.0",
+    "info": {
+        "title": "Software Catalog Register",
+        "description": "Register containing AMEF and Voorzieningen schemas for the VNG Software Catalog application. This configuration includes schemas for modules, services, organizations, and compliance tracking.",
+        "version": "2.0.1"
+    },
+    "x-openregister": {
+        "type": "application",
+        "app": "softwarecatalog",
+        "sourceType": "github",
+        "sourceUrl": "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/ConductionNL/opencatalogi/blob/master/apps-extra/softwarecatalog/lib/Settings/softwarecatalogus_register.json",
+        "openregister": "^v0.2.10",
+        "github": {
+            "repo": "ConductionNL/opencatalogi",
+            "branch": "master",
+            "path": "apps-extra/softwarecatalog/lib/Settings/softwarecatalogus_register.json"
+        }
+    },
     "components": {
         "registers": {
             "voorzieningen": {
@@ -5187,12 +5205,5 @@
             }
         },
         "objects": []
-    },
-    "openapi": "3.0.0",
-    "info": {
-        "id": 14,
-        "title": "Software Catalog Register",
-        "description": "Register containing AMEF and Voorzieningen schemas - Product schema has been merged into Module, with new Suite and Component schemas added",
-        "version": "2.0.1"
     }
 }
\ No newline at end of file