diff --git a/.gitignore b/.gitignore
index 00dfa3bc67467b7267c2815c8f6645be0759b6bf..159fd2d040dbb2bc31b032e93a50d5089aa2212f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ artifacts/
 # containerlab
 .gosdn.clab.yml
 clab-gosdn_csbi_arista_base/
+.gosdn.clab.yml.bak
 
 # non vimmers
 .vscode/
diff --git a/controller/configs/containerlab-gosdn.toml.example b/controller/configs/containerlab-gosdn.toml.example
index 3fffe360b55fc3f9d7909890e1a2bd844d05dc35..6f52b353c6594ed1e91f06d9b769e974a857841e 100644
--- a/controller/configs/containerlab-gosdn.toml.example
+++ b/controller/configs/containerlab-gosdn.toml.example
@@ -15,5 +15,5 @@ filesystemPathToStores = "stores"
 amqpPrefix = "amqp://"
 amqpUser = "guest"
 amqpPassword = "guest"
-amqpHost = "localhost"
+amqpHost = "rabbitmq"
 amqpPort = "5672"
diff --git a/gosdn.clab.yaml b/gosdn.clab.yaml
index f6acd6185f992622d62872d1f8ca59188c61afd1..69135e79707cb2bfc7f349d403a05406a1fbb15c 100644
--- a/gosdn.clab.yaml
+++ b/gosdn.clab.yaml
@@ -14,20 +14,24 @@ topology:
       kind: ceos
       mgmt_ipv4: 172.100.0.11
       group: spine
+
     ceos1a:
       kind: ceos
       mgmt_ipv4: 172.100.0.12
       group: spine
+
     centos1:
       kind: linux
       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
+
     gosdn:
       kind: linux
       image: gosdn
@@ -38,12 +42,14 @@ topology:
       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
@@ -55,6 +61,7 @@ topology:
         - ./csbi/.csbi.yaml:/etc/.csbi.yml
       cmd: --log-level trace --config /etc/.csbi.yml
       mgmt_ipv4: 172.100.0.7
+
     grafana:
       kind: linux
       image: grafana/grafana:8.1.2
@@ -63,6 +70,7 @@ topology:
       ports:
         - 3000:3000
       mgmt_ipv4: 172.100.0.8
+
     prometheus:
       kind: linux
       image: prom/prometheus:v2.29.1
@@ -72,6 +80,7 @@ topology:
         - ./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
@@ -81,6 +90,7 @@ topology:
         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
@@ -92,7 +102,16 @@ topology:
         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","centos1:eth1"]
     - endpoints: ["ceos1a:eth2","centos2:eth1"]
+