diff --git a/gosdn.clab.yaml b/gosdn.clab.yaml
index 2971d6628a206bd04283281b28209173d49c54c8..3b4c8442cd91676524eeda46389c6ba650a833f4 100644
--- a/gosdn.clab.yaml
+++ b/gosdn.clab.yaml
@@ -20,98 +20,97 @@ topology:
       mgmt_ipv4: 172.100.0.12
       group: spine
 
-    ubuntu1:
+    centos1:
       kind: linux
-      image: registry.code.fbi.h-da.de/danet/containers/ubuntu:22.04
+      image: centos:8
       mgmt_ipv4: 172.100.0.3
       group: server
 
-    #centos2:
-    #  kind: linux
-    #  image: centos:8
-    #  mgmt_ipv4: 172.100.0.4
-    #  group: server
+    centos2:
+      kind: linux
+      image: centos:8
+      mgmt_ipv4: 172.100.0.4
+      group: server
+
+    gosdn:
+      kind: linux
+      image: gosdn
+      ports:
+        - 55055:55055
+        - 8080:8080
+        - 40000:40000
+      cmd:
+        --config /gosdn/configs/containerlab-gosdn.toml
+      mgmt_ipv4: 172.100.0.5
+
+    gnmi-target:
+      kind: linux
+      image: gnmi-target
+      ports:
+        - 7030:7030
+      mgmt_ipv4: 172.100.0.6
+
+    csbi-orchestrator:
+      kind: linux
+      image: orchestrator
+      ports:
+        - 55056:55056
+        - 9338:9338
+      binds:
+        - /var/run/docker.sock:/var/run/docker.sock
+        - ./csbi/.csbi.yaml:/etc/.csbi.yml
+      cmd: --log-level trace --config /etc/.csbi.yml
+      mgmt_ipv4: 172.100.0.7
 
-    #gosdn:
-    #  kind: linux
-    #  image: gosdn
-    #  ports:
-    #    - 55055:55055
-    #    - 8080:8080
-    #    - 40000:40000
-    #  cmd:
-    #    --config /gosdn/configs/containerlab-gosdn.toml
-    #  mgmt_ipv4: 172.100.0.5
+    grafana:
+      kind: linux
+      image: grafana/grafana:8.1.2
+      binds:
+        - ./csbi/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
+      ports:
+        - 3000:3000
+      mgmt_ipv4: 172.100.0.8
 
-    #gnmi-target:
-    #  kind: linux
-    #  image: gnmi-target
-    #  ports:
-    #    - 7030:7030
-    #  mgmt_ipv4: 172.100.0.6
-#
-    #csbi-orchestrator:
-    #  kind: linux
-    #  image: orchestrator
-    #  ports:
-    #    - 55056:55056
-    #    - 9338:9338
-    #  binds:
-    #    - /var/run/docker.sock:/var/run/docker.sock
-    #    - ./csbi/.csbi.yaml:/etc/.csbi.yml
-    #  cmd: --log-level trace --config /etc/.csbi.yml
-    #  mgmt_ipv4: 172.100.0.7
+    prometheus:
+      kind: linux
+      image: prom/prometheus:v2.29.1
+      ports:
+        - 9000:9090
+      binds:
+        - ./csbi/prometheus:/etc/prometheus
+      cmd: --web.enable-lifecycle  --config.file=/etc/prometheus/prometheus.yml
+      mgmt_ipv4: 172.100.0.9
 
-    #grafana:
-    #  kind: linux
-    #  image: grafana/grafana:8.1.2
-    #  binds:
-    #    - ./csbi/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
-    #  ports:
-    #    - 3000:3000
-    #  mgmt_ipv4: 172.100.0.8
+    mongodb:
+      kind: linux
+      image: mongo:5
+      ports:
+        - 27017:27017
+      env:
+        MONGO_INITDB_ROOT_USERNAME: root
+        MONGO_INITDB_ROOT_PASSWORD: example
+      mgmt_ipv4: 172.100.0.13
 
-    #prometheus:
-    #  kind: linux
-    #  image: prom/prometheus:v2.29.1
-    #  ports:
-    #    - 9000:9090
-    #  binds:
-    #    - ./csbi/prometheus:/etc/prometheus
-    #  cmd: --web.enable-lifecycle  --config.file=/etc/prometheus/prometheus.yml
-    #  mgmt_ipv4: 172.100.0.9
-#
-    #mongodb:
-    #  kind: linux
-    #  image: mongo:5
-    #  ports:
-    #    - 27017:27017
-    #  env:
-    #    MONGO_INITDB_ROOT_USERNAME: root
-    #    MONGO_INITDB_ROOT_PASSWORD: example
-    #  mgmt_ipv4: 172.100.0.13
-#
-    #mongodb-express:
-    #  kind: linux
-    #  image: mongo-express:0.54.0
-    #  ports:
-    #    - 8081:8081
-    #  env:
-    #    ME_CONFIG_MONGODB_ADMINUSERNAME: root
-    #    ME_CONFIG_MONGODB_ADMINPASSWORD: example
-    #    ME_CONFIG_MONGODB_SERVER: mongodb
-    #  mgmt_ipv4: 172.100.0.14
-#
-    #rabbitmq:
-    #    kind: linux
-    #    image: rabbitmq:3-management
-    #    ports:
-    #      - 127.0.0.1:5672:5672
-    #      - 127.0.0.1:15672:15672
-    #    mgmt_ipv4: 172.100.0.15
+    mongodb-express:
+      kind: linux
+      image: mongo-express:0.54.0
+      ports:
+        - 8081:8081
+      env:
+        ME_CONFIG_MONGODB_ADMINUSERNAME: root
+        ME_CONFIG_MONGODB_ADMINPASSWORD: example
+        ME_CONFIG_MONGODB_SERVER: mongodb
+      mgmt_ipv4: 172.100.0.14
+
+    rabbitmq:
+        kind: linux
+        image: rabbitmq:3-management
+        ports:
+          - 127.0.0.1:5672:5672
+          - 127.0.0.1:15672:15672
+        mgmt_ipv4: 172.100.0.15
 
   links:
     - endpoints: ["ceos0:eth1","ceos1a:eth1"]
-    - endpoints: ["ceos0:eth2","ubuntu1:eth1"]
-    - endpoints: ["ceos1a:eth2","ubuntu1:eth2"]
-
+    - endpoints: ["ceos0:eth2","centos1:eth1"]
+    - endpoints: ["ceos1a:eth2","centos2:eth1"]