diff --git a/dataplane-in-a-box/deploy_specs.sh b/dataplane-in-a-box/deploy_specs.sh
index b96437ca304303772a6b37b6b57aa6efdca4444b..86f3d87111c0ddb738644313e179372b58bf048f 100755
--- a/dataplane-in-a-box/deploy_specs.sh
+++ b/dataplane-in-a-box/deploy_specs.sh
@@ -24,7 +24,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
 export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
 
 # Uncomment to activate Monitoring
-#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
+export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
 
 # Uncomment to activate ZTP
 #export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"
diff --git a/dataplane-in-a-box/tfs-01-topo-nodes.json b/dataplane-in-a-box/tfs-01-topology.json
similarity index 56%
rename from dataplane-in-a-box/tfs-01-topo-nodes.json
rename to dataplane-in-a-box/tfs-01-topology.json
index 7331664a1a37368a578566f6c3fe1b65eb35b420..73e1bc224591371f23fcebb8e45e806660916952 100644
--- a/dataplane-in-a-box/tfs-01-topo-nodes.json
+++ b/dataplane-in-a-box/tfs-01-topology.json
@@ -46,5 +46,51 @@
                 }}}
             ]}
         }
+    ],
+    "links": [
+        {
+            "link_id": {"link_uuid": {"uuid": "r1/Ethernet1==r2/Ethernet1"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
+                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
+            ]
+        },
+        {
+            "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet1"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
+                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
+            ]
+        },
+
+        {
+            "link_id": {"link_uuid": {"uuid": "r1/Ethernet10==dc1/eth1"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
+                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}}
+            ]
+        },
+        {
+            "link_id": {"link_uuid": {"uuid": "dc1/eth1==r1/Ethernet10"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}},
+                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
+            ]
+        },
+
+        {
+            "link_id": {"link_uuid": {"uuid": "r2/Ethernet10==dc2/eth1"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
+                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}}
+            ]
+        },
+        {
+            "link_id": {"link_uuid": {"uuid": "dc2/eth1==r2/Ethernet10"}},
+            "link_endpoint_ids": [
+                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}},
+                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
+            ]
+        }
     ]
 }
diff --git a/dataplane-in-a-box/tfs-03-dc1-2-dc2-l3svc.json b/dataplane-in-a-box/tfs-02-l3-service.json
similarity index 100%
rename from dataplane-in-a-box/tfs-03-dc1-2-dc2-l3svc.json
rename to dataplane-in-a-box/tfs-02-l3-service.json
diff --git a/dataplane-in-a-box/tfs-02-topo-links.json b/dataplane-in-a-box/tfs-02-topo-links.json
deleted file mode 100644
index 3e65f5b28ad73825f7d0cc1627314aa035502106..0000000000000000000000000000000000000000
--- a/dataplane-in-a-box/tfs-02-topo-links.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "links": [
-        {
-            "link_id": {"link_uuid": {"uuid": "r1/Ethernet1==r2/Ethernet1"}},
-            "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
-                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
-            ]
-        },
-        {
-            "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet1"}},
-            "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
-                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
-            ]
-        },
-
-        {
-            "link_id": {"link_uuid": {"uuid": "r1/Ethernet10==dc1/eth1"}},
-            "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
-                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}}
-            ]
-        },
-        {
-            "link_id": {"link_uuid": {"uuid": "dc1/eth1==r1/Ethernet10"}},
-            "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}},
-                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
-            ]
-        },
-
-        {
-            "link_id": {"link_uuid": {"uuid": "r2/Ethernet10==dc2/eth1"}},
-            "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
-                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}}
-            ]
-        },
-        {
-            "link_id": {"link_uuid": {"uuid": "dc2/eth1==r2/Ethernet10"}},
-            "link_endpoint_ids": [
-                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}},
-                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
-            ]
-        }
-    ]
-}