diff --git a/configs/310014.yaml.in b/configs/310014.yaml.in
index 6c4cefcc5..6299ad4ea 100644
--- a/configs/310014.yaml.in
+++ b/configs/310014.yaml.in
@@ -112,6 +112,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -193,6 +194,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/csfb.yaml.in b/configs/csfb.yaml.in
index 0688c928e..9538a580e 100644
--- a/configs/csfb.yaml.in
+++ b/configs/csfb.yaml.in
@@ -145,6 +145,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -223,6 +224,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/5gc-sepp1-999-70.yaml.in b/configs/examples/5gc-sepp1-999-70.yaml.in
index 0a84d670f..1bf052c94 100644
--- a/configs/examples/5gc-sepp1-999-70.yaml.in
+++ b/configs/examples/5gc-sepp1-999-70.yaml.in
@@ -115,6 +115,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -211,6 +212,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.1.7
diff --git a/configs/examples/5gc-sepp2-001-01.yaml.in b/configs/examples/5gc-sepp2-001-01.yaml.in
index e8df58235..67a604e6c 100644
--- a/configs/examples/5gc-sepp2-001-01.yaml.in
+++ b/configs/examples/5gc-sepp2-001-01.yaml.in
@@ -115,6 +115,7 @@ smf:
     - subnet: 10.46.0.0/16
       gateway: 10.46.0.1
     - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -212,6 +213,7 @@ upf:
       gateway: 10.46.0.1
       dev: ogstun2
     - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
       dev: ogstun2
   metrics:
     server:
diff --git a/configs/examples/5gc-sepp3-315-010.yaml.in b/configs/examples/5gc-sepp3-315-010.yaml.in
index cfbb9b7ea..d37817813 100644
--- a/configs/examples/5gc-sepp3-315-010.yaml.in
+++ b/configs/examples/5gc-sepp3-315-010.yaml.in
@@ -115,6 +115,7 @@ smf:
     - subnet: 10.47.0.0/16
       gateway: 10.47.0.1
     - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -212,6 +213,7 @@ upf:
       gateway: 10.47.0.1
       dev: ogstun3
     - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
       dev: ogstun3
   metrics:
     server:
diff --git a/configs/examples/5gc-tls-sepp1-999-70.yaml.in b/configs/examples/5gc-tls-sepp1-999-70.yaml.in
index 523df19c8..a06648ca9 100644
--- a/configs/examples/5gc-tls-sepp1-999-70.yaml.in
+++ b/configs/examples/5gc-tls-sepp1-999-70.yaml.in
@@ -116,6 +116,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -212,6 +213,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.1.7
diff --git a/configs/examples/5gc-tls-sepp2-001-01.yaml.in b/configs/examples/5gc-tls-sepp2-001-01.yaml.in
index 6a2d189af..952eca531 100644
--- a/configs/examples/5gc-tls-sepp2-001-01.yaml.in
+++ b/configs/examples/5gc-tls-sepp2-001-01.yaml.in
@@ -116,6 +116,7 @@ smf:
     - subnet: 10.46.0.0/16
       gateway: 10.46.0.1
     - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -213,6 +214,7 @@ upf:
       gateway: 10.46.0.1
       dev: ogstun2
     - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
       dev: ogstun2
   metrics:
     server:
diff --git a/configs/examples/5gc-tls-sepp3-315-010.yaml.in b/configs/examples/5gc-tls-sepp3-315-010.yaml.in
index 86f637e34..6f2d2cc6a 100644
--- a/configs/examples/5gc-tls-sepp3-315-010.yaml.in
+++ b/configs/examples/5gc-tls-sepp3-315-010.yaml.in
@@ -116,6 +116,7 @@ smf:
     - subnet: 10.47.0.0/16
       gateway: 10.47.0.1
     - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -213,6 +214,7 @@ upf:
       gateway: 10.47.0.1
       dev: ogstun3
     - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
       dev: ogstun3
   metrics:
     server:
diff --git a/configs/examples/gnb-001-01-ue-001-01.yaml.in b/configs/examples/gnb-001-01-ue-001-01.yaml.in
index 0813ed2ff..6775c45a5 100644
--- a/configs/examples/gnb-001-01-ue-001-01.yaml.in
+++ b/configs/examples/gnb-001-01-ue-001-01.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-001-01-ue-315-010.yaml.in b/configs/examples/gnb-001-01-ue-315-010.yaml.in
index 31f6f263e..7f8a9bd79 100644
--- a/configs/examples/gnb-001-01-ue-315-010.yaml.in
+++ b/configs/examples/gnb-001-01-ue-315-010.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-001-01-ue-999-70.yaml.in b/configs/examples/gnb-001-01-ue-999-70.yaml.in
index 71917b2a6..2237b90f2 100644
--- a/configs/examples/gnb-001-01-ue-999-70.yaml.in
+++ b/configs/examples/gnb-001-01-ue-999-70.yaml.in
@@ -119,6 +119,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -202,6 +203,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-315-010-ue-001-01.yaml.in b/configs/examples/gnb-315-010-ue-001-01.yaml.in
index 64491881f..678c4d4c8 100644
--- a/configs/examples/gnb-315-010-ue-001-01.yaml.in
+++ b/configs/examples/gnb-315-010-ue-001-01.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-315-010-ue-315-010.yaml.in b/configs/examples/gnb-315-010-ue-315-010.yaml.in
index f1e0e7a3d..a902e02bd 100644
--- a/configs/examples/gnb-315-010-ue-315-010.yaml.in
+++ b/configs/examples/gnb-315-010-ue-315-010.yaml.in
@@ -119,6 +119,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -202,6 +203,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-315-010-ue-999-70.yaml.in b/configs/examples/gnb-315-010-ue-999-70.yaml.in
index 968fa4aed..c8e511d91 100644
--- a/configs/examples/gnb-315-010-ue-999-70.yaml.in
+++ b/configs/examples/gnb-315-010-ue-999-70.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-999-70-ue-001-01.yaml.in b/configs/examples/gnb-999-70-ue-001-01.yaml.in
index dbe260da8..57012a6e3 100644
--- a/configs/examples/gnb-999-70-ue-001-01.yaml.in
+++ b/configs/examples/gnb-999-70-ue-001-01.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-999-70-ue-315-010.yaml.in b/configs/examples/gnb-999-70-ue-315-010.yaml.in
index c5e7453c4..e1e1f7987 100644
--- a/configs/examples/gnb-999-70-ue-315-010.yaml.in
+++ b/configs/examples/gnb-999-70-ue-315-010.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/examples/gnb-999-70-ue-999-70.yaml.in b/configs/examples/gnb-999-70-ue-999-70.yaml.in
index 8f593fa5e..a28f11a66 100644
--- a/configs/examples/gnb-999-70-ue-999-70.yaml.in
+++ b/configs/examples/gnb-999-70-ue-999-70.yaml.in
@@ -119,6 +119,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -202,6 +203,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/non3gpp.yaml.in b/configs/non3gpp.yaml.in
index 7771c31a8..cb053eeda 100644
--- a/configs/non3gpp.yaml.in
+++ b/configs/non3gpp.yaml.in
@@ -113,6 +113,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -196,6 +197,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
index f33f60461..890d3ca94 100644
--- a/configs/open5gs/smf.yaml.in
+++ b/configs/open5gs/smf.yaml.in
@@ -37,6 +37,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
diff --git a/configs/open5gs/upf.yaml.in b/configs/open5gs/upf.yaml.in
index 5965cb5a9..b368e41b2 100644
--- a/configs/open5gs/upf.yaml.in
+++ b/configs/open5gs/upf.yaml.in
@@ -21,6 +21,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/sample.yaml.in b/configs/sample.yaml.in
index 0ba574232..12f3f6859 100644
--- a/configs/sample.yaml.in
+++ b/configs/sample.yaml.in
@@ -121,6 +121,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,6 +208,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/slice.yaml.in b/configs/slice.yaml.in
index 6e6944085..b8ca7e1bf 100644
--- a/configs/slice.yaml.in
+++ b/configs/slice.yaml.in
@@ -113,6 +113,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -198,6 +199,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/srsenb.yaml.in b/configs/srsenb.yaml.in
index 2948f0f07..a30bbf520 100644
--- a/configs/srsenb.yaml.in
+++ b/configs/srsenb.yaml.in
@@ -110,6 +110,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -188,6 +189,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/configs/volte.yaml.in b/configs/volte.yaml.in
index 36ec7c3d2..bad3225da 100644
--- a/configs/volte.yaml.in
+++ b/configs/volte.yaml.in
@@ -110,6 +110,7 @@ smf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -191,6 +192,7 @@ upf:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1
     - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
   metrics:
     server:
       - address: 127.0.0.7
diff --git a/lib/pfcp/context.c b/lib/pfcp/context.c
index 9252ef0d5..810939e68 100644
--- a/lib/pfcp/context.c
+++ b/lib/pfcp/context.c
@@ -2208,9 +2208,7 @@ ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
             ogs_log_print(OGS_LOG_WARN, "  session:\n");
             ogs_log_print(OGS_LOG_WARN, "    - subnet: %s/%s\n",
                     subnet_string ? subnet_string : "Unknown", mask_or_numbits);
-            if (subnet->family == AF_INET)
-                ogs_log_print(OGS_LOG_WARN, "      gateway: %s", ipstr);
-            ogs_log_print(OGS_LOG_WARN, "\n\n\n");
+            ogs_log_print(OGS_LOG_WARN, "      gateway: %s\n\n\n", ipstr);
 
             ogs_free(subnet_string);
         }