diff --git a/configs/open5gs/sgwc.yaml.in b/configs/open5gs/sgwc.yaml.in
index 9c7b00db6..886009ef6 100644
--- a/configs/open5gs/sgwc.yaml.in
+++ b/configs/open5gs/sgwc.yaml.in
@@ -146,6 +146,8 @@ parameter:
 #    ue: 1024
 # o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 64
+# o Maximum Number of GTP peer nodes per SGWC/SMF
+#    gtp_peer: 64
 #
 max:
 
diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
index 4148021e6..b826ff603 100644
--- a/configs/open5gs/smf.yaml.in
+++ b/configs/open5gs/smf.yaml.in
@@ -531,6 +531,8 @@ parameter:
 #    ue: 1024
 # o Maximum Number of gNB/eNB per AMF/MME
 #    gnb: 64
+# o Maximum Number of GTP peer nodes per SGWC/SMF
+#    gtp_peer: 64
 #
 max:
 
diff --git a/lib/app/ogs-context.c b/lib/app/ogs-context.c
index f7e3ad5d9..38568aba3 100644
--- a/lib/app/ogs-context.c
+++ b/lib/app/ogs-context.c
@@ -83,7 +83,7 @@ static void recalculate_pool_size(void)
 
 #define MAX_NUM_OF_XACT         8
     self.pool.gtp_xact = self.max.ue * MAX_NUM_OF_XACT;
-    self.pool.gtp_node = self.pool.nf;
+    self.pool.gtp_node = self.max.gtp_peer;
 
     self.pool.pfcp_xact = self.max.ue * MAX_NUM_OF_XACT;
     self.pool.pfcp_node = self.pool.nf;
@@ -190,9 +190,11 @@ static void app_context_prepare(void)
 
 #define MAX_NUM_OF_UE               1024    /* Num of UE per AMF/MME */
 #define MAX_NUM_OF_GNB              64      /* Num of gNB per AMF/MME */
+#define MAX_NUM_OF_GTP_PEER         64      /* Num of gtp_node per SGW/PGW */
 
     self.max.gnb = MAX_NUM_OF_GNB;
     self.max.ue = MAX_NUM_OF_UE;
+    self.max.gtp_peer = MAX_NUM_OF_GTP_PEER;
 
     ogs_pkbuf_default_init(&self.pool.defconfig);
 
@@ -437,6 +439,9 @@ int ogs_app_context_parse_config(void)
                             !strcmp(max_key, "enb")) {
                     const char *v = ogs_yaml_iter_value(&max_iter);
                     if (v) self.max.gnb = atoi(v);
+                } else if (!strcmp(max_key, "gtp_peer")) {
+                    const char *v = ogs_yaml_iter_value(&max_iter);
+                    if (v) self.max.gtp_peer = atoi(v);
                 } else
                     ogs_warn("unknown key `%s`", max_key);
             }
diff --git a/lib/app/ogs-context.h b/lib/app/ogs-context.h
index 217f89646..a8cfc099d 100644
--- a/lib/app/ogs-context.h
+++ b/lib/app/ogs-context.h
@@ -103,6 +103,7 @@ typedef struct ogs_app_context_s {
     struct {
         uint64_t ue;
         uint64_t gnb;
+        uint64_t gtp_peer;
     } max;
 
     struct {