diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
index afb5cf28..4b5891e6 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
@@ -3,6 +3,10 @@
 logger:
     level: info
 
+global:
+  max:
+    ue: 1024
+
 sbi:
     server:
       no_tls: true
@@ -17,30 +21,43 @@ sbi:
 
 smf:
     sbi:
-      - addr: 172.18.3.201
+      server:
+      - address: 172.18.3.201
         port: 7777
+      client:
+        nrf:
+          - uri: http://172.18.3.201:7777
+        scp:
+          - uri: http://127.0.1.10:7777
     pfcp:
-      - addr: 172.18.3.201
+      server:
+        - address: 172.18.3.201
+      client:
+        upf:
+          - address: 172.18.3.222
     gtpc:
-      - addr: 172.18.3.201
-        option:
-          so_bindtodevice: eth0
+      server:
+        - address: 172.18.3.201
+          option:
+            so_bindtodevice: eth0
     gtpu:
-      - addr: 172.18.3.201
-        port: 2152
-        option:
-          so_bindtodevice: eth0
+      server:
+        - address: 172.18.3.201
+          port: 2152
+          option:
+            so_bindtodevice: eth0
     metrics:
-        addr: 172.18.3.201
-        port: 9090
-    subnet:
-      - addr: 176.16.16.1/20
+      server:
+        - address: 172.18.3.201
+          port: 9090
+    session:
+      - subnet: 176.16.16.1/20
         dnn: internet
-      - addr: 2001:780:44:2000:0:0:0:1/56
+      - subnet: 2001:780:44:2000:0:0:0:1/56
         dnn: inet6
-      - addr: 176.16.32.1/20
+      - subnet: 176.16.32.1/20
         dnn: inet46
-      - addr: 2001:780:44:2100:0:0:0:1/56
+      - subnet: 2001:780:44:2100:0:0:0:1/56
         dnn: inet46
     dns:
       - 172.18.3.222
@@ -52,21 +69,6 @@ smf:
       enabled: auto
     freeDiameter: /data/freediameter.conf
 
-scp:
-    sbi:
-      - addr: 127.0.1.10
-        port: 7777
-
-nrf:
-    sbi:
-      - addr:
-          - 172.18.3.201
-        port: 7777
-
-upf:
-    pfcp:
-      - addr: 172.18.3.222
-
 parameter:
 
 max:
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
index 73e1bacf..81afc6ea 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
@@ -3,31 +3,37 @@
 logger:
     level: info
 
+global:
+  max:
+    ue: 1024
+
 upf:
     pfcp:
-      - addr: 172.18.3.222
+      server:
+        - address: 172.18.3.222
     gtpu:
-      - addr: 172.18.3.222
-        port: 2152
-        option:
-          so_bindtodevice: eth0
-    subnet:
-      - addr: 176.16.16.1/20
+      server:
+        - address: 172.18.3.222
+          port: 2152
+          option:
+            so_bindtodevice: eth0
+    session:
+      - subnet: 176.16.16.1/20
         dnn: internet
         dev: ogstun4
-      - addr: 2001:780:44:2000:0:0:0:1/56
+      - subnet: 2001:780:44:2000:0:0:0:1/56
         dnn: inet6
         dev: ogstun6
-      - addr: 176.16.32.1/20
+      - subnet: 176.16.32.1/20
         dnn: inet46
         dev: ogstun46
-      - addr: 2001:780:44:2100:0:0:0:1/56
+      - subnet: 2001:780:44:2100:0:0:0:1/56
         dnn: inet46
         dev: ogstun46
 
 smf:
     pfcp:
-      - addr: 172.18.3.201
+      - address: 172.18.3.201
 
 parameter:
 
diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
index 8d1f42ed..df92b6fd 100644
--- a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
+++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
@@ -5,6 +5,10 @@ db_uri: mongodb://172.18.3.103/open5gs
 logger:
     level: trace
 
+global:
+  max:
+    ue: 1024
+
 hss:
     freeDiameter: /data/freediameter.conf
 
diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
index 35b718d0..520a0b56 100644
--- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
+++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
@@ -3,26 +3,52 @@
 logger:
     level: info
 
+global:
+  max:
+    ue: 1024
+
 mme:
     freeDiameter: /data/freediameter.conf
     s1ap:
-      - addr: 172.18.3.201
+      server:
+        - address: 172.18.3.201
     gtpc:
-      - addr: 172.18.3.201
+      server:
+        - address: 172.18.3.201
+      client:
+        sgwc:
+          - address: 172.18.3.202
+        smf:
+          - address: 172.18.3.201
+          - address: ::1
+        sgsn:
+          - address:
+            - 172.18.3.202
+            port: 2124
+            routes:
+              - rai:
+                  lai:
+                    plmn_id:
+                      mcc: 262
+                      mnc: 42
+                    lac: 43690
+                  rac: 187
+                ci: 1223
     metrics:
-      - addr: 172.18.3.201
-        port: 9090
+      server:
+        - address: 172.18.3.201
+          port: 9090
     gummei:
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      mme_gid: 2
-      mme_code: 1
+      - plmn_id:
+          mcc: 001
+          mnc: 01
+        mme_gid: 2
+        mme_code: 1
     tai:
-      plmn_id:
-        mcc: 001
-        mnc: 01
-      tac: 12345
+      - plmn_id:
+          mcc: 001
+          mnc: 01
+        tac: 12345
     security:
         integrity_order : [ EIA2, EIA1, EIA0 ]
         ciphering_order : [ EEA0, EEA1, EEA2 ]
@@ -30,31 +56,6 @@ mme:
         full: Open5GS
     mme_name: open5gs-mme0
 
-sgwc:
-    gtpc:
-      - addr: 172.18.3.202
-
-smf:
-    gtpc:
-      - addr:
-        - 172.18.3.201
-        - ::1
-
-sgsn:
-  - gtpc:
-      addr:
-        - 172.18.3.202
-      port: 2124
-    routes:
-      - rai:
-          lai:
-            plmn_id:
-              mcc: 262
-              mnc: 42
-            lac: 43690
-          rac: 187
-        ci: 1223
-
 parameter:
 
 max:
diff --git a/ttcn3-pgw-test/open5gs-nrf-master.yaml b/ttcn3-pgw-test/open5gs-nrf-master.yaml
index b37ec0d8..45c33401 100644
--- a/ttcn3-pgw-test/open5gs-nrf-master.yaml
+++ b/ttcn3-pgw-test/open5gs-nrf-master.yaml
@@ -5,6 +5,10 @@ db_uri: mongodb://localhost/open5gs
 logger:
     level: info
 
+global:
+  max:
+    ue: 1024
+
 sbi:
     server:
       no_tls: true
@@ -19,9 +23,9 @@ sbi:
 
 nrf:
     sbi:
-      addr:
-        - 172.18.18.10
-      port: 7777
+      server:
+        - address: 172.18.18.10
+          port: 7777
 
 scp:
     sbi:
diff --git a/ttcn3-pgw-test/open5gs-smf-master.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml
index 622618ba..3448abae 100644
--- a/ttcn3-pgw-test/open5gs-smf-master.yaml
+++ b/ttcn3-pgw-test/open5gs-smf-master.yaml
@@ -3,6 +3,10 @@
 logger:
     level: info
 
+global:
+  max:
+    ue: 1024
+
 sbi:
     server:
       no_tls: true
@@ -17,21 +21,34 @@ sbi:
 
 smf:
     sbi:
-      - addr: 172.18.18.4
-        port: 7777
+      server:
+        - address: 172.18.18.4
+          port: 7777
+      client:
+        nrf:
+          - uri: http://172.18.18.10:7777
+        scp:
+          - uri: http://127.0.1.10:7777
     pfcp:
-      - addr: 172.18.18.4
+      server:
+        - address: 172.18.18.4
+      client:
+        upf:
+          - address: 172.18.18.7
     gtpc:
-      - addr: 172.18.18.4
+      server:
+        - address: 172.18.18.4
     gtpu:
-      - addr: 172.18.18.4
+      server:
+        - address: 172.18.18.4
     metrics:
-        addr: 172.18.18.4
-        port: 9090
-    subnet:
-      - addr: 10.45.0.1/16
+      server:
+        - address: 172.18.18.4
+          port: 9090
+    session:
+      - subnet: 10.45.0.1/16
         dnn: internet
-      - addr: cafe::1/64
+      - subnet: cafe::1/64
         dnn: internet
     dns:
       - 8.8.8.8
@@ -43,20 +60,6 @@ smf:
       enabled: auto
     freeDiameter: /data/freeDiameter-smf.conf
 
-scp:
-    sbi:
-      - addr: 127.0.1.10
-        port: 7777
-nrf:
-    sbi:
-      - addr:
-          - 172.18.18.10
-        port: 7777
-
-upf:
-    pfcp:
-      - addr: 172.18.18.7
-
 parameter:
 
 max:
diff --git a/ttcn3-pgw-test/open5gs-upf-master.yaml b/ttcn3-pgw-test/open5gs-upf-master.yaml
index fec9fc7f..9e9280aa 100644
--- a/ttcn3-pgw-test/open5gs-upf-master.yaml
+++ b/ttcn3-pgw-test/open5gs-upf-master.yaml
@@ -3,23 +3,28 @@
 logger:
     level: info
 
+global:
+  max:
+    ue: 1024
+
 upf:
     pfcp:
-      - addr: 172.18.18.7
+      server:
+        - address: 172.18.18.7
+      client:
+        smf:
+          - address: 172.18.18.4
     gtpu:
-      - addr: 172.18.18.7
-    subnet:
-      - addr: 10.45.0.1/16
+      server:
+        - address: 172.18.18.7
+    session:
+      - subnet: 10.45.0.1/16
         dnn: internet
         dev: ogstun46
-      - addr: cafe::1/64
+      - subnet: cafe::1/64
         dnn: internet
         dev: ogstun46
 
-smf:
-    pfcp:
-      addr: 172.18.18.4
-
 parameter:
 
 max: