diff --git a/docs/_docs/guide/01-quickstart.md b/docs/_docs/guide/01-quickstart.md
index 156bf75db..e1dbf1a35 100644
--- a/docs/_docs/guide/01-quickstart.md
+++ b/docs/_docs/guide/01-quickstart.md
@@ -340,7 +340,7 @@ upf:
      gtpu:
 -      - addr: 127.0.0.7
 +      - addr: 10.11.0.7 # for external gNB - a local address that can be reached by the gNB
-     pdn:
+     subnet:
        - addr: 10.45.0.1/16
        - addr: cafe::1/64
 
diff --git a/docs/_docs/guide/02-building-open5gs-from-sources.md b/docs/_docs/guide/02-building-open5gs-from-sources.md
index 5a12c2970..4617ff9c8 100644
--- a/docs/_docs/guide/02-building-open5gs-from-sources.md
+++ b/docs/_docs/guide/02-building-open5gs-from-sources.md
@@ -146,7 +146,7 @@ $ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
 -        - 127.0.0.7
 -        - ::1
 +      - addr: 10.11.0.7
-     pdn:
+     subnet:
        - addr: 10.45.0.1/16
        - addr: cafe::1/64
 ```
diff --git a/docs/_docs/guide/03-splitting-network-functions.md b/docs/_docs/guide/03-splitting-network-functions.md
index cd5a03964..050ef2253 100644
--- a/docs/_docs/guide/03-splitting-network-functions.md
+++ b/docs/_docs/guide/03-splitting-network-functions.md
@@ -121,7 +121,7 @@ $ diff -u /etc/open5gs/smf.yaml.old /etc/open5gs/smf.yaml
 -      - addr: 127.0.0.4
 -      - addr: ::1
 +      - addr: 10.10.0.4
-     pdn:
+     subnet:
        - addr: 10.45.0.1/16
        - addr: cafe::1/64
 @@ -282,7 +281,7 @@
@@ -214,7 +214,7 @@ $ diff -u /etc/open5gs/upf.yaml.old /etc/open5gs/upf.yaml
 -        - 127.0.0.7
 -        - ::1
 +      - addr: 10.11.0.7
-     pdn:
+     subnet:
        - addr: 10.45.0.1/16
        - addr: cafe::1/64
 ```
diff --git a/docs/_docs/troubleshoot/02-now-in-github-issues.md b/docs/_docs/troubleshoot/02-now-in-github-issues.md
index ab5688077..887820416 100644
--- a/docs/_docs/troubleshoot/02-now-in-github-issues.md
+++ b/docs/_docs/troubleshoot/02-now-in-github-issues.md
@@ -156,7 +156,7 @@ $ diff -u smf.yaml smf.yaml.new
 @@ -190,7 +190,7 @@
        - addr: 127.0.0.4
        - addr: ::1
-     pdn:
+     subnet:
 -      - addr: 10.45.0.1/16
 +      - addr: 10.46.0.1/16
        - addr: cafe::1/64
@@ -171,7 +171,7 @@ $ diff -u upf.yaml upf.yaml.new
 @@ -139,7 +139,7 @@
      gtpu:
        - addr: 127.0.0.7
-     pdn:
+     subnet:
 -      - addr: 10.45.0.1/16
 +      - addr: 10.46.0.1/16
        - addr: cafe::1/64
@@ -536,19 +536,19 @@ The IP address of the UE can also use a different UE pool depending on the DNN/A
 
 ```
 ### For reference, see `smf.yaml`
-#  <PDN Configuration with UE Pool>
+#  <Subnet for UE Pool>
 #
 #  o IPv4 Pool
 #    $ sudo ip addr add 10.45.0.1/16 dev ogstun
 #
-#    pdn:
+#    subnet:
 #      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:
+#    subnet:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #
@@ -560,7 +560,7 @@ The IP address of the UE can also use a different UE pool depending on the DNN/A
 #    $ sudo ip addr add cafe:1::1/64 dev ogstun
 #    $ sudo ip addr add cafe:2::1/64 dev ogstun
 #
-#    pdn:
+#    subnet:
 #      - addr: 10.45.0.1/16
 #      - addr: cafe:1::1/64
 #      - addr: 10.46.0.1/16
@@ -568,41 +568,24 @@ The IP address of the UE can also use a different UE pool depending on the DNN/A
 #      - addr: cafe:2::1/64
 #        dnn: volte
 #
-#  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
-#      - addr: cafe:1::1/64
-#        dev: ogstun2
-#      - addr: 10.46.0.1/16
-#        dnn: volte
-#        dev: ogstun3
-#      - addr: cafe:2::1/64
-#        dnn: volte
-#        dev: ogstun3
-#
 #  o Pool Range Sample
-#    pdn:
+#    subnet:
 #      - addr: 10.45.0.1/24
 #        range: 10.45.0.100-10.45.0.200
 #
-#    pdn:
+#    subnet:
 #      - addr: 10.45.0.1/24
 #        range:
 #          - 10.45.0.5-10.45.0.50
 #          - 10.45.0.100-
 #
-#    pdn:
+#    subnet:
 #      - addr: 10.45.0.1/24
 #        range:
 #          - -10.45.0.200
 #          - 10.45.0.210-10.45.0.220
 #
-#    pdn:
+#    subnet:
 #      - addr: 10.45.0.1/16
 #        range:
 #          - 10.45.0.100-10.45.0.200