diff --git a/hackfest/containerlab/srl1.cli b/hackfest/containerlab/srl1.cli
index c72ae130af2fd3eea72cc7f47438c2f139c72ce9..b0e1b5c79e889a9707119c31452ffd53c177126b 100644
--- a/hackfest/containerlab/srl1.cli
+++ b/hackfest/containerlab/srl1.cli
@@ -13,5 +13,4 @@ set / network-instance default interface ethernet-1/2.0
 set / network-instance default next-hop-groups group group1 nexthop 1 ip-address 172.0.0.2 admin-state enable
 set / network-instance default static-routes route 172.16.2.0/24 next-hop-group group1 admin-state enable
 
-set / system management openconfig admin-state enable
-set / system gnmi-server network-instance mgmt yang-models openconfig
\ No newline at end of file
+set / system gnmi-server network-instance mgmt admin-state enable
\ No newline at end of file
diff --git a/hackfest/containerlab/srl2.cli b/hackfest/containerlab/srl2.cli
index c72ae130af2fd3eea72cc7f47438c2f139c72ce9..a5c72d0277dfb7f57a3d383d611cafeb0e2adca5 100644
--- a/hackfest/containerlab/srl2.cli
+++ b/hackfest/containerlab/srl2.cli
@@ -1,6 +1,6 @@
 set / interface ethernet-1/2 admin-state enable
 set / interface ethernet-1/2 subinterface 0 admin-state enable
-set / interface ethernet-1/2 subinterface 0 ipv4 address 172.16.1.1/24
+set / interface ethernet-1/2 subinterface 0 ipv4 address 172.16.2.1/24
 
 set / interface ethernet-1/1 admin-state enable
 set / interface ethernet-1/1 subinterface 0 admin-state enable
@@ -13,5 +13,4 @@ set / network-instance default interface ethernet-1/2.0
 set / network-instance default next-hop-groups group group1 nexthop 1 ip-address 172.0.0.2 admin-state enable
 set / network-instance default static-routes route 172.16.2.0/24 next-hop-group group1 admin-state enable
 
-set / system management openconfig admin-state enable
-set / system gnmi-server network-instance mgmt yang-models openconfig
\ No newline at end of file
+set / system gnmi-server network-instance mgmt admin-state enable
\ No newline at end of file
diff --git a/hackfest/containerlab/tfs-descriptors/topology.json b/hackfest/containerlab/tfs-descriptors/topology.json
index e4a49981f99339d77538af814365703e463d3db5..f5d1c0d73e76f39a4f7e360d94eb0b544bef6587 100644
--- a/hackfest/containerlab/tfs-descriptors/topology.json
+++ b/hackfest/containerlab/tfs-descriptors/topology.json
@@ -32,7 +32,7 @@
                 {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.100.100.101"}},
                 {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "57400"}},
                 {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
-                    "username": "admin", "password": "NokiaSrl1!", "use_tls": true
+                    "username": "admin", "password": "admin", "use_tls": true
                 }}}
             ]}
         },
@@ -42,7 +42,7 @@
                 {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.100.100.102"}},
                 {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "57400"}},
                 {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
-                    "username": "admin", "password": "NokiaSrl1!", "use_tls": true
+                    "username": "admin", "password": "admin", "use_tls": true
                 }}}
             ]}
         }
diff --git a/hackfest/containerlab/tfs-scenario.clab.yml b/hackfest/containerlab/tfs-scenario.clab.yml
index ffb00dfc9cf9fb1da3efef263068165b46317bcd..950870b847242c84e443dcb1cde08f7121060b44 100644
--- a/hackfest/containerlab/tfs-scenario.clab.yml
+++ b/hackfest/containerlab/tfs-scenario.clab.yml
@@ -20,28 +20,27 @@ name: tfs-scenario
 mgmt:
   network: mgmt-net
   ipv4-subnet: 172.100.100.0/24
-
 topology:
   kinds:
-    srl:
-      image: ghcr.io/nokia/srlinux:23.3.1
+    nokia_srlinux:
+      image: ghcr.io/nokia/srlinux:21.11.3
     linux:
       image: ghcr.io/hellt/network-multitool
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixr6
       cpu: 0.5
       memory: 1GB
       mgmt-ipv4: 172.100.100.101
-      #startup-config: srl1.cli
+      startup-config: srl1.cli
     srl2:
-      kind: srl
+      kind: nokia_srlinux
       type: ixr6
       cpu: 0.5
       memory: 1GB
       mgmt-ipv4: 172.100.100.102
-      #startup-config: srl2.cli
+      startup-config: srl2.cli
     client1:
       kind: linux
       cpu: 0.1