diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 23ff65d..2da5f4d 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -8,7 +8,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.1.23
+version: 2.1.24
 appVersion: v0.0.0
 keywords:
   - aether
@@ -21,7 +21,7 @@
   - name: onos-topo
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
-    version: 1.3.3
+    version: 1.3.5
   - name: onos-config
     condition: import.onos-config.enabled
     repository: https://charts.onosproject.org
diff --git a/fabric-umbrella/Chart.yaml b/fabric-umbrella/Chart.yaml
index aabbf87..bfa1723 100644
--- a/fabric-umbrella/Chart.yaml
+++ b/fabric-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Fabric ROC Umbrella chart to deploy all Fabric ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.7
+version: 0.1.8
 appVersion: v0.0.0
 keywords:
   - aether
@@ -20,7 +20,7 @@
   - name: onos-topo
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
-    version: 1.3.3
+    version: 1.3.5
   - name: onos-config
     condition: import.onos-config.enabled
     repository: https://charts.onosproject.org
diff --git a/fabric-umbrella/templates/topo.yaml b/fabric-umbrella/templates/topo.yaml
index 6b2f6a8..a2ceb64 100644
--- a/fabric-umbrella/templates/topo.yaml
+++ b/fabric-umbrella/templates/topo.yaml
@@ -26,6 +26,12 @@
       address: fabric-adapter-v0-1:5150
       version: 0.1.x
       type: sdn-fabric
+    onos.topo.ControllerInfo:
+      control_endpoint:
+        address: {{ .onos.address }}
+        port: {{ .onos.port }}
+      username: {{ .onos.username }}
+      password: {{ .onos.password }}
     onos.topo.Location:
       lat: {{ .lat }}
       lng: {{ .long }}
diff --git a/fabric-umbrella/values.yaml b/fabric-umbrella/values.yaml
index f70857f..3d5ccef 100644
--- a/fabric-umbrella/values.yaml
+++ b/fabric-umbrella/values.yaml
@@ -125,5 +125,15 @@
 fabrics:
   - id: mars
     name: Mars Fabric
+    onos:
+      address: netcfg.onos.mars
+      port: 8080
+      username: onos
+      password: rocks
   - id: venus
     name: Venus Fabric
+    onos:
+      address: netcfg.onos.venus
+      port: 8080
+      username: onos
+      password: rocks