diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
index 63251a5e54..a5dc9dc676 100644
--- a/configs/open5gs/smf.yaml.in
+++ b/configs/open5gs/smf.yaml.in
@@ -86,44 +86,32 @@ logger:
 #  <PDN Configuration with UE Pool>
 #
 #  o IPv4 Pool
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#
 #    pdn:
 #      addr: 10.45.0.1/16
 #
 #  o IPv4/IPv6 Pool
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun
-#
 #    pdn:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #
 #
-#  o Specific APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
-#    All other APNs use 10.45.0.1/16, cafe:1::1/64
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun
-#    $ sudo ip addr add cafe:2::1/64 dev ogstun
-#
+#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
 #    pdn:
 #      - addr: 10.45.0.1/16
+#        apn: internet
 #      - addr: cafe:1::1/64
+#        apn: internet
 #      - addr: 10.46.0.1/16
 #        apn: ims
 #      - addr: cafe:2::1/64
 #        apn: ims
 #
 #  o Multiple Devices (default: ogstun)
-#    $ sudo ip addr add 10.45.0.1/16 dev ogstun
-#    $ sudo ip addr add cafe:1::1/64 dev ogstun2
-#    $ sudo ip addr add 10.46.0.1/16 dev ogstun3
-#    $ sudo ip addr add cafe:2::1/64 dev ogstun3
-#
 #    pdn:
 #      - addr: 10.45.0.1/16
+#        apn: internet
 #      - addr: cafe:1::1/64
+#        apn: internet
 #        dev: ogstun2
 #      - addr: 10.46.0.1/16
 #        apn: ims
diff --git a/configs/open5gs/upf.yaml.in b/configs/open5gs/upf.yaml.in
index 2756e3c380..cc5d0fa774 100644
--- a/configs/open5gs/upf.yaml.in
+++ b/configs/open5gs/upf.yaml.in
@@ -74,7 +74,7 @@ logger:
 #      - addr: cafe:1::1/64
 #
 #
-#  o Specific APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
+#  o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
 #    All other APNs use 10.45.0.1/16, cafe:1::1/64
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
 #    $ sudo ip addr add 10.46.0.1/16 dev ogstun
@@ -83,7 +83,9 @@ logger:
 #
 #    pdn:
 #      - addr: 10.45.0.1/16
+#        apn: internet
 #      - addr: cafe:1::1/64
+#        apn: internet
 #      - addr: 10.46.0.1/16
 #        apn: ims
 #      - addr: cafe:2::1/64
@@ -97,7 +99,9 @@ logger:
 #
 #    pdn:
 #      - addr: 10.45.0.1/16
+#        apn: internet
 #      - addr: cafe:1::1/64
+#        apn: internet
 #        dev: ogstun2
 #      - addr: 10.46.0.1/16
 #        apn: ims
diff --git a/lib/pfcp/context.c b/lib/pfcp/context.c
index 224b1e22d3..e8ed7ed614 100644
--- a/lib/pfcp/context.c
+++ b/lib/pfcp/context.c
@@ -329,7 +329,8 @@ int ogs_pfcp_context_parse_config(const char *local, const char *remote)
                                         mask_or_numbits = (const char *)v;
                                     }
                                 }
-                            } else if (!strcmp(pdn_key, "apn")) {
+                            } else if (!strcmp(pdn_key, "apn") ||
+                                        !strcmp(pdn_key, "dnn")) {
                                 apn = ogs_yaml_iter_value(&pdn_iter);
                             } else if (!strcmp(pdn_key, "dev")) {
                                 dev = ogs_yaml_iter_value(&pdn_iter);