diff --git a/ci-scripts/charts/oai-5g-basic/config.yaml b/ci-scripts/charts/oai-5g-basic/config.yaml
index 8e2bd379afe0a249343de978f434bbc83ba632d9..d345b78dd91dc9dbd9a588067d281fefad562f0f 100644
--- a/ci-scripts/charts/oai-5g-basic/config.yaml
+++ b/ci-scripts/charts/oai-5g-basic/config.yaml
@@ -185,14 +185,12 @@ upf:
     enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: 127.0.0.1      # Dummy pod since simple-switch does not use N6 GW
   upf_info:
-    - sst: 1
-      sd: 0xFFFFFF
-      dnnList:
-        - dnn: oai
-    - sst: 1
-      sd: 0xFFFFFF
-      dnnList:
-        - dnn: ims
+    sNssaiUpfInfoList:
+      - sNssai:
+          sst: 1
+        dnnUpfInfoList:
+          - dnn: "oai"
+          - dnn: "ims"
 
 ## DNN configuration
 dnns:
diff --git a/docker-compose/conf/basic_nrf_config.yaml b/docker-compose/conf/basic_nrf_config.yaml
index da86c42f9b7839e819e4bf7316d05947801bee54..61ebf8fbaccd24ef3276e97b4870d65d97f669f1 100644
--- a/docker-compose/conf/basic_nrf_config.yaml
+++ b/docker-compose/conf/basic_nrf_config.yaml
@@ -224,18 +224,16 @@ upf:
     enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
   upf_info:
-    - sst: 1
-      sd: 0xFFFFFF
-      dnnList:
-        - dnn: oai
-    - sst: 1
-      sd: 1
-      dnnList:
-        - dnn: oai.ipv4
-    - sst: 222
-      sd: 123
-      dnnList:
-        - dnn: default
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice2
+        dnnUpfInfoList:
+          - dnn: "oai.ipv4"
+      - sNssai: *custom_slice
+        dnnUpfInfoList:
+          - dnn: "default"
 
 ## DNN configuration
 dnns:
diff --git a/docker-compose/conf/basic_nrf_config_ebpf.yaml b/docker-compose/conf/basic_nrf_config_ebpf.yaml
index a26a60cbbeb0fba153a9835907d73aa2f1fc12d5..3fb8e7189925a574a421275ee1add8442b9ebd86 100644
--- a/docker-compose/conf/basic_nrf_config_ebpf.yaml
+++ b/docker-compose/conf/basic_nrf_config_ebpf.yaml
@@ -221,18 +221,16 @@ upf:
     enable_snat: no             # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: localhost       # Dummy host since simple-switch does not use N6 GW
   upf_info:
-    - sst: 1
-      sd: 0xFFFFFF
-      dnnList:
-        - dnn: oai
-    - sst: 1
-      sd: 1
-      dnnList:
-        - dnn: oai.ipv4
-    - sst: 222
-      sd: 123
-      dnnList:
-        - dnn: default
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice2
+        dnnUpfInfoList:
+          - dnn: "oai.ipv4"
+      - sNssai: *custom_slice
+        dnnUpfInfoList:
+          - dnn: "default"
 
 ## DNN configuration
 dnns:
diff --git a/docker-compose/conf/mini_nonrf_config.yaml b/docker-compose/conf/mini_nonrf_config.yaml
index 0437414632ea3ee3bf7d294abeb80ebf73444ff2..86ad559e44ede6723cddb3a5a91b758e2df3883f 100644
--- a/docker-compose/conf/mini_nonrf_config.yaml
+++ b/docker-compose/conf/mini_nonrf_config.yaml
@@ -208,18 +208,16 @@ upf:
     enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
   upf_info:
-    - sst: 1
-      sd: 0xFFFFFF
-      dnnList:
-        - dnn: oai
-    - sst: 1
-      sd: 1
-      dnnList:
-        - dnn: oai.ipv4
-    - sst: 222
-      sd: 123
-      dnnList:
-        - dnn: default
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+      - sNssai: *embb_slice2
+        dnnUpfInfoList:
+          - dnn: "oai.ipv4"
+      - sNssai: *custom_slice
+        dnnUpfInfoList:
+          - dnn: "default"
 
 ## DNN configuration
 dnns:
diff --git a/docker-compose/conf/slicing_slice1_config.yaml b/docker-compose/conf/slicing_slice1_config.yaml
index 9c9ceee030959986e098ac1c9fb98747b8dfaa5b..dab655fad869be794e0ed612e91d435e1559282b 100644
--- a/docker-compose/conf/slicing_slice1_config.yaml
+++ b/docker-compose/conf/slicing_slice1_config.yaml
@@ -112,10 +112,10 @@ upf:
     enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
   upf_info:
-    - sst: 128
-      sd: 128
-      dnnList:
-        - dnn: default
+    sNssaiUpfInfoList:
+      - sNssai: *slice1
+        dnnUpfInfoList:
+          - dnn: "default"
 
 ## DNN configuration
 dnns:
diff --git a/docker-compose/conf/slicing_slice2_config.yaml b/docker-compose/conf/slicing_slice2_config.yaml
index e51a49722f7c5034d1523b29961a43b98fd30ae2..f17965d65f63c6cae33c1731565f84a1f7f30f9f 100644
--- a/docker-compose/conf/slicing_slice2_config.yaml
+++ b/docker-compose/conf/slicing_slice2_config.yaml
@@ -111,10 +111,10 @@ upf:
     enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
   upf_info:
-    - sst: 1
-      sd: 0xFFFFFF
-      dnnList:
-        - dnn: oai
+    sNssaiUpfInfoList:
+      - sNssai: *slice2
+        dnnUpfInfoList:
+          - dnn: "oai"
 
 ## DNN configuration
 dnns: