diff --git a/Makefile b/Makefile
index 4a96cdf360b7fd2d0ecc625c5c17846b79ce5283..080f36e56b3cc13fce934c29b60f5f2e267da5c3 100644
--- a/Makefile
+++ b/Makefile
@@ -84,11 +84,9 @@ akms-simulator-container:
 
 build-images: gokms-container quantumlayer-container akms-simulator-container
 
-compose-up: generate-gokms-certs build-images install-gosdnc
+compose-up: generate-gokms-certs build-images
 	docker compose down
 	docker compose up -d
-	echo "Will add devices, can take a while"
-	./config/controller/add_devices.sh
 
 compose-down:
 	docker compose down
diff --git a/config/controller/inventory-manager.yaml b/config/controller/inventory-manager.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..66bfde315f407a9e77b5716317e25fc52e6ebc54
--- /dev/null
+++ b/config/controller/inventory-manager.yaml
@@ -0,0 +1,34 @@
+ControllerAddress: "qkdn-controller:55055"
+PndID: "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d"
+UserName: "admin"
+UserPW: "TestPassword"
+AppName: "Inventory-Manager"
+NetworkElements:
+  - Name: "kms01"
+    UUID: "0ff33c82-7fe1-482b-a0ca-67565806ee4b"
+    Address: "kms01:7030"
+    Username: "admin"
+    Password: "admin"
+    Tls : false
+    PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d"
+  - Name: "kms02"
+    UUID: "5e41c291-6121-4335-84f6-41e04b8bdaa2"
+    Address: "kms02:7030"
+    Username: "admin"
+    Password: "admin"
+    Tls : false
+    PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d"
+  - Name: "kms03"
+    UUID: "f80db2c0-2480-46b9-b7d1-b63f954e8227"
+    Address: "kms03:7030"
+    Username: "admin"
+    Password: "admin"
+    Tls : false
+    PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d"
+  - Name: "kms04"
+    UUID: "968fd594-b0e7-41f0-ba4b-de259047a933"
+    Address: "kms04:7030"
+    Username: "admin"
+    Password: "admin"
+    Tls : false
+    PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d"
diff --git a/docker-compose.yml b/docker-compose.yml
index 32355fb8cdc1d8074579e1d6e4bb62430ff3bc35..ae4839148f7b84c274a32a9be83841f25ef26b2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,17 +96,18 @@ services:
     volumes:
       - ./config/controller/qkdn-gosdn.toml:/app/configs/qkdn-gosdn.toml
       - ./config/controller/gNMISubscriptions.txt:/app/configs/gNMISubscriptions.txt
-    command: --config ./configs/qkdn-gosdn.toml
+    command: --config ./configs/qkdn-gosdn.toml --log-level debug
     ports:
       - "127.0.0.1:55055:55055"
     environment:
       GOSDN_ADMIN_PASSWORD: TestPassword
 
-  gosdnc:
-    image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/gosdnc:qkdn-main
+  inventory-manager:
+    image: registry.code.fbi.h-da.de/danet/gosdn/inventory-manager:inventory-manager
+    #image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/inventory-manager:qkdn-main
+    command: --log debug --config /configs/inventory-manager.yaml
     volumes:
-      - ./config/controller/add_devices.sh:/scripts/add_devices.sh
-    entrypoint: ["/scripts/add_devices.sh"]
+      - ./config/controller/inventory-manager.yaml:/configs/inventory-manager.yaml
 
   plugin-registry:
     image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/plugin-registry:qkdn-main
@@ -117,12 +118,24 @@ services:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: example
 
+  mongo-express:
+    image: mongo-express
+    ports:
+        - 127.0.0.1:8081:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+      ME_CONFIG_MONGODB_SERVER: mongo
+      ME_CONFIG_MONGODB_PORT: 27017
+      ME_CONFIG_BASICAUTH_USERNAME: root
+      ME_CONFIG_BASICAUTH_PASSWORD: example
+
   rabbitmq:
     image: rabbitmq:3-management
 
-  routing-app:
-    image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/routing-app:qkdn-main
-    entrypoint: ["./start_ra_sleep.sh"]
-    volumes:
-      - ./config/controller/start_ra_sleep.sh:/app/start_ra_sleep.sh
-      - ./config/controller/routing-config.yaml:/new/routing-config.yaml
+  #routing-app:
+  #  image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/routing-app:qkdn-main
+  #  entrypoint: ["./start_ra_sleep.sh"]
+  #  volumes:
+  #    - ./config/controller/start_ra_sleep.sh:/app/start_ra_sleep.sh
+  #    - ./config/controller/routing-config.yaml:/new/routing-config.yaml