diff --git a/fabric/leaf1.cfg b/fabric/leaf1.cfg
index 79407cc..29b161f 100644
--- a/fabric/leaf1.cfg
+++ b/fabric/leaf1.cfg
@@ -382,8 +382,8 @@
                 router-id 10.0.0.1
                 group ebgp-underlay {
                     admin-state enable
-                    export-policy export-to-underlay
-                    import-policy import-from-underlay
+                    export-policy [export-to-underlay]
+                    import-policy [import-from-underlay]
                     peer-as 65177
                     afi-safi ipv4-unicast {
                         admin-state enable
@@ -400,8 +400,8 @@
                 }
                 group ibgp-evpn {
                     admin-state enable
-                    export-policy export-all
-                    import-policy import-all
+                    export-policy [export-all]
+                    import-policy [import-all]
                     peer-as 65501
                     failure-detection {
                         enable-bfd true
@@ -431,11 +431,12 @@
                     }
                 }
                 afi-safi ipv4-unicast {
-		    admin-state enable
+		            admin-state enable
                     multipath {
                         allow-multiple-as true
-                        max-paths-level-1 64
-                        max-paths-level-2 64
+                        ebgp {
+                            maximum-paths 64
+                        }
                     }
                 }
                 afi-safi evpn {
@@ -498,7 +499,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
@@ -526,7 +529,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
diff --git a/fabric/leaf2.cfg b/fabric/leaf2.cfg
index fc3f7d6..6ca2d43 100644
--- a/fabric/leaf2.cfg
+++ b/fabric/leaf2.cfg
@@ -418,8 +418,8 @@
                 router-id 10.0.0.2
                 group ebgp-underlay {
                     admin-state enable
-                    export-policy export-to-underlay
-                    import-policy import-from-underlay
+                    export-policy [export-to-underlay]
+                    import-policy [import-from-underlay]
                     peer-as 65177
                     afi-safi ipv4-unicast {
                         admin-state enable
@@ -436,8 +436,8 @@
                 }
                 group ibgp-evpn {
                     admin-state enable
-                    export-policy export-all
-                    import-policy import-all
+                    export-policy [export-all]
+                    import-policy [import-all]
                     peer-as 65501
                     failure-detection {
                         enable-bfd true
@@ -470,8 +470,9 @@
 		    admin-state enable
                     multipath {
                         allow-multiple-as true
-                        max-paths-level-1 64
-                        max-paths-level-2 64
+                        ebgp {
+                            maximum-paths 64
+                        }
                     }
                 }
                 afi-safi evpn {
@@ -534,7 +535,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
@@ -562,7 +565,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
diff --git a/fabric/leaf3.cfg b/fabric/leaf3.cfg
index 3476cd2..a2f92c1 100644
--- a/fabric/leaf3.cfg
+++ b/fabric/leaf3.cfg
@@ -420,8 +420,8 @@
                 router-id 10.0.0.3
                 group ebgp-underlay {
                     admin-state enable
-                    export-policy export-to-underlay
-                    import-policy import-from-underlay
+                    export-policy [export-to-underlay]
+                    import-policy [import-from-underlay]
                     peer-as 65177
                     afi-safi ipv4-unicast {
                         admin-state enable
@@ -438,8 +438,8 @@
                 }
                 group ibgp-evpn {
                     admin-state enable
-                    export-policy export-all
-                    import-policy import-all
+                    export-policy [export-all]
+                    import-policy [import-all]
                     peer-as 65501
                     failure-detection {
                         enable-bfd true
@@ -472,8 +472,9 @@
 		    admin-state enable
                     multipath {
                         allow-multiple-as true
-                        max-paths-level-1 64
-                        max-paths-level-2 64
+                        ebgp {
+                            maximum-paths 64
+                        }
                     }
                 }
                 afi-safi evpn {
@@ -536,7 +537,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
@@ -564,7 +567,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
diff --git a/fabric/spine1.cfg b/fabric/spine1.cfg
index 01e800e..8e92fc0 100644
--- a/fabric/spine1.cfg
+++ b/fabric/spine1.cfg
@@ -319,8 +319,8 @@
                 router-id 10.0.0.5
                 group ebgp-underlay {
                     admin-state enable
-                    export-policy export-to-underlay
-                    import-policy import-from-underlay
+                    export-policy [export-to-underlay]
+                    import-policy [import-from-underlay]
                     afi-safi ipv4-unicast {
                         admin-state enable
                     }
@@ -336,8 +336,8 @@
                 }
                 group ibgp-evpn {
                     admin-state enable
-                    export-policy export-all
-                    import-policy import-all
+                    export-policy [export-all]
+                    import-policy [import-all]
                     peer-as 65501
                     failure-detection {
                         enable-bfd true
@@ -353,7 +353,7 @@
                         admin-state enable
                     }
                     local-as {
-			as-number 65501
+			            as-number 65501
                     }
                     route-reflector {
                         client true
@@ -374,8 +374,9 @@
 	            admin-state enable
                     multipath {
                         allow-multiple-as true
-                        max-paths-level-1 64
-                        max-paths-level-2 64
+                        ebgp {
+                            maximum-paths 64
+                        }
                     }
                 }
                 afi-safi evpn {
@@ -447,7 +448,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
@@ -475,7 +478,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
diff --git a/fabric/spine2.cfg b/fabric/spine2.cfg
index e2dd6ca..4a92c99 100644
--- a/fabric/spine2.cfg
+++ b/fabric/spine2.cfg
@@ -319,8 +319,8 @@
                 router-id 10.0.0.6
                 group ebgp-underlay {
                     admin-state enable
-                    export-policy export-to-underlay
-                    import-policy import-from-underlay
+                    export-policy [export-to-underlay]
+                    import-policy [import-from-underlay]
                     afi-safi ipv4-unicast {
                         admin-state enable
                     }
@@ -336,8 +336,8 @@
                 }
                 group ibgp-evpn {
                     admin-state enable
-                    export-policy export-all
-                    import-policy import-all
+                    export-policy [export-all]
+                    import-policy [import-all]
                     peer-as 65501
                     failure-detection {
                         enable-bfd true
@@ -374,8 +374,9 @@
                     admin-state enable
                     multipath {
                         allow-multiple-as true
-                        max-paths-level-1 64
-                        max-paths-level-2 64
+                        ebgp {
+                            maximum-paths 64
+                        }
                     }
                 }
                 afi-safi evpn {
@@ -447,7 +448,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
@@ -475,7 +478,9 @@
             }
             statement 10 {
                 match {
-                    prefix-set loopbacks
+                    prefix {
+                        prefix-set loopbacks
+                    }
                 }
                 action {
                     policy-result accept
diff --git a/srl-elk.clab.yml b/srl-elk.clab.yml
index b536315..7a59c99 100644
--- a/srl-elk.clab.yml
+++ b/srl-elk.clab.yml
@@ -7,11 +7,14 @@ mgmt:
 
 topology:
   kinds:
-    srl:
-      image: ghcr.io/nokia/srlinux:23.3.1
+    nokia_srlinux:
+      image: ghcr.io/nokia/srlinux:25.3.2
       type: ixrd3
-      wait-for:
-        - kibana
+      stages:
+        create:
+          wait-for:
+            - node: kibana
+              stage: configure
     linux:
       image: ghcr.io/hellt/network-multitool
 
@@ -21,26 +24,26 @@ topology:
     #
     leaf1:
       mgmt-ipv4: 172.22.22.21
-      kind: srl
+      kind: nokia_srlinux
       group: tier-1
       startup-config: fabric/leaf1.cfg
     leaf2:
-      kind: srl
+      kind: nokia_srlinux
       mgmt-ipv4: 172.22.22.22
       group: tier-1
       startup-config: fabric/leaf2.cfg
     leaf3:
-      kind: srl
+      kind: nokia_srlinux
       mgmt-ipv4: 172.22.22.23
       group: tier-1
       startup-config: fabric/leaf3.cfg
     spine1:
-      kind: srl
+      kind: nokia_srlinux
       mgmt-ipv4: 172.22.22.25
       group: tier-2
       startup-config: fabric/spine1.cfg
     spine2:
-      kind: srl
+      kind: nokia_srlinux
       mgmt-ipv4: 172.22.22.26
       group: tier-2
       startup-config: fabric/spine2.cfg
@@ -68,8 +71,12 @@ topology:
         - ./elk/logstash/patterns:/var/lib/logstash/patterns
         - ./elk/logstash/logs/fail_to_parse_srl.log:/srl/fail_to_parse_srl.log
         - ./elk/logstash/index-template.json:/tmp/index-template.json
-      wait-for:
-        - elastic
+      stages:
+        create:
+          wait-for:
+            - node: elastic
+              stage: configure
+
     kibana:
       kind: linux
       mgmt-ipv4: 172.22.22.12
@@ -78,8 +85,11 @@ topology:
         - ./elk/kibana/kibana.yml:/usr/share/kibana/config/kibana.yml
       ports:
         - 5601:5601/tcp
-      wait-for:
-        - elastic
+      stages:
+        create:
+          wait-for:
+           - node: elastic
+             stage: configure
     #
     # CLIENTS
     #