diff --git a/tools/package/config/samples/network-cfg-fabric-2x2-all.json b/tools/package/config/samples/network-cfg-fabric-2x2-all.json
index 2de901e..1cb57a1 100644
--- a/tools/package/config/samples/network-cfg-fabric-2x2-all.json
+++ b/tools/package/config/samples/network-cfg-fabric-2x2-all.json
@@ -4,15 +4,6 @@
         "interfaces" : [
             {
                 "ips" : [ "10.0.1.254/24" ]
-            },
-            {
-                "vlan" : "20"
-            },
-            {
-                "vlan" : "10"
-            },
-            {
-                "vlan" : "222"
             }
         ]
     },
@@ -23,25 +14,6 @@
             }
         ]
     },
-    "of:0000000000000001/65" : {
-        "interfaces" : [
-            {
-                "name" : "fujitsu-olt",
-                "vlan" : "20"
-            }
-        ]
-    },
-    "of:0000000000000001/73" : {
-        "interfaces" : [
-            {
-                "name" : "pmc-olt",
-                "vlan" : "10"
-            },
-            {
-                "vlan" : "222"
-            }
-        ]
-    },
     "of:0000000000000002/5" : {
         "interfaces" : [
             {
@@ -240,6 +212,20 @@
                 "suppressHostByPort" : [
                     "of:0000000000000002/31", "of:0000000000000002/32"
                 ]
+            },
+            "xconnect": {
+                "of:0000000000000001": [
+                    {
+                        "vlan": 10,
+                        "ports": [5, 73],
+                        "name": "OLT1"
+                    },
+                    {
+                        "vlan": 20,
+                        "ports": [5, 89],
+                        "name": "OLT2"
+                    }
+                ]
             }
         },
         "org.onosproject.router" : {