diff --git a/containerlab/frinx_topo_1/config_r1_cpe1.partial.txt b/containerlab/frinx_topo_1/config_r1_cpe1.partial.txt
index 182691c..c4c8be1 100644
--- a/containerlab/frinx_topo_1/config_r1_cpe1.partial.txt
+++ b/containerlab/frinx_topo_1/config_r1_cpe1.partial.txt
@@ -1,12 +1,14 @@
-!
-interface GigabitEthernet0/0/0/2
+interface GigabitEthernet0/0/0/0
  ipv4 address 172.16.10.10 255.255.255.0
+ no shutdown
 !
 interface Loopback0
  ipv4 address 192.168.10.1 255.255.255.128
+ no shutdown
 !
 interface Loopback1
  ipv4 address 192.168.10.129 255.255.255.128
+ no shutdown
 !
 router static
  address-family ipv4 unicast
@@ -14,3 +16,4 @@ router static
  !
 !
 lldp
+!
\ No newline at end of file
diff --git a/containerlab/frinx_topo_1/config_r1_cpe2.partial.txt b/containerlab/frinx_topo_1/config_r1_cpe2.partial.txt
index 05d6c1e..c1faece 100644
--- a/containerlab/frinx_topo_1/config_r1_cpe2.partial.txt
+++ b/containerlab/frinx_topo_1/config_r1_cpe2.partial.txt
@@ -1,12 +1,14 @@
-!
-interface GigabitEthernet0/0/0/2
+interface GigabitEthernet0/0/0/0
  ipv4 address 172.16.20.10 255.255.255.0
+ no shutdown
 !
 interface Loopback0
  ipv4 address 192.168.20.1 255.255.255.128
+ no shutdown
 !
 interface Loopback1
  ipv4 address 192.168.20.129 255.255.255.128
+ no shutdown
 !
 router static
  address-family ipv4 unicast
@@ -14,3 +16,4 @@ router static
  !
 !
 lldp
+!
\ No newline at end of file
diff --git a/containerlab/frinx_topo_1/config_r2_cpe1.partial.txt b/containerlab/frinx_topo_1/config_r2_cpe1.partial.txt
index a633b08..545ff09 100644
--- a/containerlab/frinx_topo_1/config_r2_cpe1.partial.txt
+++ b/containerlab/frinx_topo_1/config_r2_cpe1.partial.txt
@@ -1,12 +1,14 @@
-!
-interface GigabitEthernet0/0/0/2
+interface GigabitEthernet0/0/0/0
  ipv4 address 172.16.30.10 255.255.255.0
+ no shutdown
 !
 interface Loopback0
  ipv4 address 192.168.30.1 255.255.255.128
+ no shutdown
 !
 interface Loopback1
  ipv4 address 192.168.30.129 255.255.255.128
+ no shutdown
 !
 router static
  address-family ipv4 unicast
@@ -14,3 +16,4 @@ router static
  !
 !
 lldp
+!
\ No newline at end of file
diff --git a/containerlab/frinx_topo_1/config_r2_cpe2.partial.txt b/containerlab/frinx_topo_1/config_r2_cpe2.partial.txt
index 7ef1c41..ef78ae7 100644
--- a/containerlab/frinx_topo_1/config_r2_cpe2.partial.txt
+++ b/containerlab/frinx_topo_1/config_r2_cpe2.partial.txt
@@ -1,12 +1,14 @@
-!
-interface GigabitEthernet0/0/0/2
+interface GigabitEthernet0/0/0/0
  ipv4 address 172.16.40.10 255.255.255.0
+ no shutdown
 !
 interface Loopback0
  ipv4 address 192.168.40.1 255.255.255.128
+ no shutdown
 !
 interface Loopback1
  ipv4 address 192.168.40.129 255.255.255.128
+ no shutdown
 !
 router static
  address-family ipv4 unicast
@@ -14,3 +16,4 @@ router static
  !
 !
 lldp
+!
\ No newline at end of file
diff --git a/containerlab/frinx_topo_1/frinx_topo_1.clab.yml b/containerlab/frinx_topo_1/frinx_topo_1.clab.yml
index 65bea2d..76a4e87 100644
--- a/containerlab/frinx_topo_1/frinx_topo_1.clab.yml
+++ b/containerlab/frinx_topo_1/frinx_topo_1.clab.yml
@@ -9,7 +9,6 @@ topology:
       vars:
         isis_iid: 1
   nodes:
-
     # PTP & SyncE GMs
     PTP_GM:
       mgmt-ipv4: 172.20.20.9
@@ -48,32 +47,32 @@ topology:
       startup-config: config_r2_pe2.partial.txt
 
     R1_CPE1:
-      image: vrnetlab/vr-xrv9k:5.3.4
-      kind: cisco_xrv9k
+      image: vrnetlab/vr-xrv:6.0.1
+      kind: cisco_xrv
       mgmt-ipv4: 172.20.20.202
       startup-config: config_r1_cpe1.partial.txt
       env:
         RAM: 4096
 
     R1_CPE2:
-      image: vrnetlab/vr-xrv9k:5.3.4
-      kind: cisco_xrv9k
+      image: vrnetlab/vr-xrv:6.0.1
+      kind: cisco_xrv
       mgmt-ipv4: 172.20.20.203
       startup-config: config_r1_cpe2.partial.txt
       env:
         RAM: 4096
 
     R2_CPE1:
-      image: vrnetlab/vr-xrv9k:5.3.4
-      kind: cisco_xrv9k
+      image: vrnetlab/vr-xrv:6.0.1
+      kind: cisco_xrv
       mgmt-ipv4: 172.20.20.204
       startup-config: config_r2_cpe1.partial.txt
       env:
         RAM: 4096
 
     R2_CPE2:
-      image: vrnetlab/vr-xrv9k:5.3.4
-      kind: cisco_xrv9k
+      image: vrnetlab/vr-xrv:6.0.1
+      kind: cisco_xrv
       mgmt-ipv4: 172.20.20.205
       startup-config: config_r2_cpe2.partial.txt
       env:
@@ -109,7 +108,7 @@ topology:
     - endpoints: [PTP_GM:eth1, C1:eth5]
     - endpoints: [PTP_GM_BACKUP:eth1, C2:eth5]
 
-    # openswitch to Region 1 and 2
+    # openvswitch to Region 1 and 2
     - endpoints: [R1_OLT:ovsp1, R1_CPE1:eth1]
     - endpoints: [R1_OLT:ovsp2, R1_CPE2:eth1]
     - endpoints: [R2_CMTS:ovsp4, R2_CPE1:eth1]
diff --git a/containerlab/openswitch1.sh b/containerlab/openswitch1.sh
index 425e5fe..01a512e 100755
--- a/containerlab/openswitch1.sh
+++ b/containerlab/openswitch1.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# remove existing bridges
+ovs-vsctl del-br R1_OLT
+ovs-vsctl del-br R2_CMTS
+
 # adding two bridges
 ovs-vsctl add-br R1_OLT
 ovs-vsctl add-br R2_CMTS
diff --git a/containerlab/openswitch2.sh b/containerlab/openswitch2.sh
index 6f78b5c..67acab9 100755
--- a/containerlab/openswitch2.sh
+++ b/containerlab/openswitch2.sh
@@ -17,9 +17,13 @@ ovs-vsctl set interface ovsp5 lldp:enable=true
 # port from R2_CMTS to R2_PE1
 ovs-vsctl set interface ovsp6 lldp:enable=true
 
+# delete mappings
+ovs-vsctl del-aa-mapping R1_OLT 1 1
+ovs-vsctl del-aa-mapping R2_CMTS 2 2
+
 # add mapping to bridges
-ovs-vsctl add-aa-mapping R1_OLT 0 0
-ovs-vsctl add-aa-mapping R2_CMTS 0 0
+ovs-vsctl add-aa-mapping R1_OLT 1 1
+ovs-vsctl add-aa-mapping R2_CMTS 2 2
 
 # add name visible in LLDP table 
 ovs-vsctl set AutoAttach R1_OLT system_name="R1_OLT"
@@ -53,3 +57,7 @@ ovs-vsctl set port ovsp6 trunks=10,20
 
 ovs-vsctl set port ovsp3 vlan_mode=trunk
 ovs-vsctl set port ovsp6 vlan_mode=trunk
+
+# clear automatically created trunk ports
+sudo ovs-vsctl clear port R2_CMTS trunks
+sudo ovs-vsctl clear port R1_OLT trunks