diff --git a/.gitignore b/.gitignore
index 360fcc9..5e472ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
+*.bak
 internal-lab-setup-assets/images/*
 !internal-lab-setup-assets/images/README.md
diff --git a/internal-lab-setup-assets/startup-config/cisco1.conf b/internal-lab-setup-assets/startup-config/cisco1.conf
index 9a11d06..2eb74de 100644
--- a/internal-lab-setup-assets/startup-config/cisco1.conf
+++ b/internal-lab-setup-assets/startup-config/cisco1.conf
@@ -31,11 +31,11 @@ interface Loopback1
  ipv4 address 10.0.1.1 255.255.255.0
 !
 interface GigabitEthernet0/0/0/0
- description NOT_IN_USE
+ description -> CISCO3
  shutdown
 !
 interface GigabitEthernet0/0/0/1
- description foobar
+ description -> CISCO2
  ip address 172.17.1.16 255.255.255.254
 !
 interface GigabitEthernet0/0/0/1.100
@@ -49,7 +49,7 @@ interface GigabitEthernet0/0/0/1.200
  ip address 192.0.2.1 255.255.255.0
 !
 interface GigabitEthernet0/0/0/2
- description NOT_IN_USE
+ description -> UBUNTU
  shutdown
 !
 route-policy PERMIT_ALL
diff --git a/internal-lab-setup-assets/startup-config/cisco2.conf b/internal-lab-setup-assets/startup-config/cisco2.conf
index eed41b9..8ddc0ab 100644
--- a/internal-lab-setup-assets/startup-config/cisco2.conf
+++ b/internal-lab-setup-assets/startup-config/cisco2.conf
@@ -26,6 +26,28 @@ netconf-yang agent
 cdp
 lldp
 !
+interface GigabitEthernet0/0/0/0
+ description -> CISCO3
+ shutdown
+!
+interface GigabitEthernet0/0/0/1
+ description -> CISCO1
+ ip address 172.17.1.17 255.255.255.254
+!
+interface GigabitEthernet0/0/0/1.100
+ description bar to foo
+ encapsulation dot1Q 100
+ ip address 198.51.100.2 255.255.255.0
+!
+interface GigabitEthernet0/0/0/1.200
+ description foo to biz
+ encapsulation dot1Q 200
+ ip address 192.0.2.2 255.255.255.0
+!
+interface GigabitEthernet0/0/0/2
+ description -> UBUNTU
+ shutdown
+!
 router static
  address-family ipv4 unicast
   0.0.0.0/0 MgmtEth0/RP0/CPU0/0 {{ .MgmtIPv4Gateway }}
diff --git a/internal-lab-setup-assets/startup-config/cisco3.conf b/internal-lab-setup-assets/startup-config/cisco3.conf
new file mode 100644
index 0000000..3a5e4ac
--- /dev/null
+++ b/internal-lab-setup-assets/startup-config/cisco3.conf
@@ -0,0 +1,54 @@
+hostname {{ .ShortName }}
+username clab
+ group root-lr
+ group cisco-support
+ secret 10 $6$7/293.lG/gI3....$qhqRPSKeGBilG47Ii/xlYF9xJVR1IK7bnw.7HHiVj4Aj8cb58bxiLAim8Xz.beUfJ6TQTP3vHUty3UO.4KmaL.
+!
+grpc
+ no-tls
+ address-family dual
+!
+line default
+ transport input ssh
+!
+call-home
+ service active
+ contact smart-licensing
+ profile CiscoTAC-1
+  active
+  destination transport-method email disable
+  destination transport-method http
+ !
+!
+netconf-yang agent
+ ssh
+!
+cdp
+lldp
+!
+interface GigabitEthernet0/0/0/0
+ description -> CISCO1
+ shutdown
+!
+interface GigabitEthernet0/0/0/1
+ description -> CISCO2
+ shutdown
+!
+interface GigabitEthernet0/0/0/2
+ description -> UBUNTU
+ shutdown
+!
+router static
+ address-family ipv4 unicast
+  0.0.0.0/0 MgmtEth0/RP0/CPU0/0 {{ .MgmtIPv4Gateway }}
+ !
+ address-family ipv6 unicast
+  ::/0 MgmtEth0/RP0/CPU0/0 {{ .MgmtIPv6Gateway }}
+ !
+!
+xml agent tty
+ iteration off
+!
+ssh server v2
+ssh server netconf vrf default
+end
diff --git a/internal-lab-setup-assets/workshop.clab.yml.j2 b/internal-lab-setup-assets/workshop.clab.yml.j2
index ff8ccce..ab80fe7 100644
--- a/internal-lab-setup-assets/workshop.clab.yml.j2
+++ b/internal-lab-setup-assets/workshop.clab.yml.j2
@@ -42,8 +42,9 @@ topology:
         CX23_LAB_PASSWORD: Self-Nose-Reasonable-Dust-{{"%02d" % id}}
 
   links:
-    - endpoints: ["cisco1:Gi0-0-0-0", "cisco2:Gi0-0-0-0"]
-    - endpoints: ["cisco1:Gi0-0-0-1", "cisco3:Gi0-0-0-0"]
-    - endpoints: ["cisco2:Gi0-0-0-1", "cisco3:Gi0-0-0-1"]
+    - endpoints: ["cisco1:Gi0-0-0-0", "cisco3:Gi0-0-0-0"]
+    - endpoints: ["cisco1:Gi0-0-0-1", "cisco2:Gi0-0-0-1"]
+    - endpoints: ["cisco2:Gi0-0-0-0", "cisco3:Gi0-0-0-1"]
     - endpoints: ["ubuntu:eth1", "cisco1:Gi0-0-0-2"]
     - endpoints: ["ubuntu:eth2", "cisco2:Gi0-0-0-2"]
+    - endpoints: ["ubuntu:eth3", "cisco3:Gi0-0-0-2"]