diff --git a/dataplane-in-a-box/clab-deploy.sh b/dataplane-in-a-box/clab-deploy.sh
index b66480b9b9f27f7476de8afa2bd7b91eea4f2a1d..a1ce30c259614618675215fe856918242a6a7bd4 100755
--- a/dataplane-in-a-box/clab-deploy.sh
+++ b/dataplane-in-a-box/clab-deploy.sh
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cd /home/tfs/tfs-ctrl/dataplane-in-a-box
+cd /home/$USER/tfs-ctrl/dataplane-in-a-box
 sudo containerlab deploy --topo arista.clab.yml
diff --git a/dataplane-in-a-box/clab-destroy.sh b/dataplane-in-a-box/clab-destroy.sh
index 1cf83516ada48b3bb512d1f311abe084d07417e2..57917900b887ef21ac297ce99f118e4621e8fb4f 100755
--- a/dataplane-in-a-box/clab-destroy.sh
+++ b/dataplane-in-a-box/clab-destroy.sh
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cd /home/tfs/tfs-ctrl/dataplane-in-a-box
+cd /home/$USER/tfs-ctrl/dataplane-in-a-box
 sudo containerlab destroy --topo arista.clab.yml
 sudo rm -rf clab-arista/ .arista.clab.yml.bak
diff --git a/dataplane-in-a-box/clab-inspect.sh b/dataplane-in-a-box/clab-inspect.sh
index 7037602cdf34775f905292323b443a6c895c445d..a4d51eac41558c059b556f66e94a452ba2b5bd3c 100755
--- a/dataplane-in-a-box/clab-inspect.sh
+++ b/dataplane-in-a-box/clab-inspect.sh
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cd /home/tfs/tfs-ctrl/dataplane-in-a-box
+cd /home/$USER/tfs-ctrl/dataplane-in-a-box
 sudo containerlab inspect --topo arista.clab.yml
diff --git a/dataplane-in-a-box/tfs-01-topology.json b/dataplane-in-a-box/tfs-01-topology.json
index 6362584ba846f3c33b08b9e619ac59623b46c7b7..ac87af62d31e4728c12687c525233d8e840d7441 100644
--- a/dataplane-in-a-box/tfs-01-topology.json
+++ b/dataplane-in-a-box/tfs-01-topology.json
@@ -49,21 +49,47 @@
                     "username": "admin", "password": "admin", "use_tls": false
                 }}}
             ]}
+        },
+        {
+            "device_id": {"device_uuid": {"uuid": "r3"}}, "device_type": "packet-router",
+            "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
+            "device_config": {"config_rules": [
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.103"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
+                    "username": "admin", "password": "admin", "use_tls": false
+                }}}
+            ]}
         }
     ],
     "links": [
         {
-            "link_id": {"link_uuid": {"uuid": "r1/Ethernet1==r2/Ethernet1"}},
+            "link_id": {"link_uuid": {"uuid": "r1/Ethernet2==r2/Ethernet1"}},
             "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
+                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet2"}},
                 {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
             ]
         },
         {
-            "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet1"}},
+            "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet2"}},
             "link_endpoint_ids": [
                 {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
-                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
+                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet2"}}
+            ]
+        },
+
+        {
+            "link_id": {"link_uuid": {"uuid": "r2/Ethernet3==r3/Ethernet2"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet3"}},
+                {"device_id": {"device_uuid": {"uuid": "r3"}}, "endpoint_uuid": {"uuid": "Ethernet2"}}
+            ]
+        },
+        {
+            "link_id": {"link_uuid": {"uuid": "r3/Ethernet2==r2/Ethernet3"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "r3"}}, "endpoint_uuid": {"uuid": "Ethernet2"}},
+                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet3"}}
             ]
         },
 
@@ -83,17 +109,17 @@
         },
 
         {
-            "link_id": {"link_uuid": {"uuid": "r2/Ethernet10==dc2/eth1"}},
+            "link_id": {"link_uuid": {"uuid": "r3/Ethernet10==dc2/eth1"}},
             "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
+                {"device_id": {"device_uuid": {"uuid": "r3"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
                 {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}}
             ]
         },
         {
-            "link_id": {"link_uuid": {"uuid": "dc2/eth1==r2/Ethernet10"}},
+            "link_id": {"link_uuid": {"uuid": "dc2/eth1==r3/Ethernet10"}},
             "link_endpoint_ids": [
                 {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}},
-                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
+                {"device_id": {"device_uuid": {"uuid": "r3"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
             ]
         }
     ]