diff --git a/configs/open5gs/amf.yaml.in b/configs/open5gs/amf.yaml.in
index ab5ab09d8..1971e1360 100644
--- a/configs/open5gs/amf.yaml.in
+++ b/configs/open5gs/amf.yaml.in
@@ -260,19 +260,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/ausf.yaml.in b/configs/open5gs/ausf.yaml.in
index fa8cbc90a..e88560a05 100644
--- a/configs/open5gs/ausf.yaml.in
+++ b/configs/open5gs/ausf.yaml.in
@@ -136,19 +136,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/hss.yaml.in b/configs/open5gs/hss.yaml.in
index 698c03b2a..c38d77f33 100644
--- a/configs/open5gs/hss.yaml.in
+++ b/configs/open5gs/hss.yaml.in
@@ -62,19 +62,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/mme.yaml.in b/configs/open5gs/mme.yaml.in
index 710d46c81..d2da2167b 100644
--- a/configs/open5gs/mme.yaml.in
+++ b/configs/open5gs/mme.yaml.in
@@ -369,19 +369,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/nrf.yaml.in b/configs/open5gs/nrf.yaml.in
index abe227f96..95ccafe44 100644
--- a/configs/open5gs/nrf.yaml.in
+++ b/configs/open5gs/nrf.yaml.in
@@ -108,19 +108,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/pcf.yaml.in b/configs/open5gs/pcf.yaml.in
index 26670692d..938497a8c 100644
--- a/configs/open5gs/pcf.yaml.in
+++ b/configs/open5gs/pcf.yaml.in
@@ -138,19 +138,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/pcrf.yaml.in b/configs/open5gs/pcrf.yaml.in
index d4ccd8912..67627f902 100644
--- a/configs/open5gs/pcrf.yaml.in
+++ b/configs/open5gs/pcrf.yaml.in
@@ -61,19 +61,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/sgwc.yaml.in b/configs/open5gs/sgwc.yaml.in
index 7e87f8abe..11f771d4a 100644
--- a/configs/open5gs/sgwc.yaml.in
+++ b/configs/open5gs/sgwc.yaml.in
@@ -143,19 +143,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/sgwu.yaml.in b/configs/open5gs/sgwu.yaml.in
index 2c1188111..12f8b1ca2 100644
--- a/configs/open5gs/sgwu.yaml.in
+++ b/configs/open5gs/sgwu.yaml.in
@@ -134,19 +134,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/smf.yaml.in b/configs/open5gs/smf.yaml.in
index 21083c5a5..a1af636d8 100644
--- a/configs/open5gs/smf.yaml.in
+++ b/configs/open5gs/smf.yaml.in
@@ -313,19 +313,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/udm.yaml.in b/configs/open5gs/udm.yaml.in
index 63ded0bcd..7a68aec37 100644
--- a/configs/open5gs/udm.yaml.in
+++ b/configs/open5gs/udm.yaml.in
@@ -136,19 +136,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/udr.yaml.in b/configs/open5gs/udr.yaml.in
index a69034f31..f2a60a06a 100644
--- a/configs/open5gs/udr.yaml.in
+++ b/configs/open5gs/udr.yaml.in
@@ -138,19 +138,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/configs/open5gs/upf.yaml.in b/configs/open5gs/upf.yaml.in
index e07fe9c0f..56f0b5424 100644
--- a/configs/open5gs/upf.yaml.in
+++ b/configs/open5gs/upf.yaml.in
@@ -219,19 +219,20 @@ max:
 #
 # pool:
 #
-# o The Number of Default Memory Pool Size
+# o The default memory pool size was set assuming 1024 UEs.
+#   To connect more UEs, you need to increase the size further.
 #
-#   - Pool-size 128         => 32768 Number
-#   - Pool-size 256         => 4096 Number
-#   - Pool-size 512         => 2048 Number
+#   - Pool-size 128         => 65536 Number
+#   - Pool-size 256         => 8192 Number
+#   - Pool-size 512         => 4096 Number
 #   - Pool-size 1024        => 1024 Number
 #   - Pool-size 2048        => 512 Number
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  32768
-#    256:  4096
-#    512:  2048
+#    128:  65536
+#    256:  8192
+#    512:  4096
 #    1024: 1024
 #    2048: 512
 #    8192: 128
diff --git a/lib/core/ogs-pkbuf.c b/lib/core/ogs-pkbuf.c
index 48c43eaa4..a98c54ef8 100644
--- a/lib/core/ogs-pkbuf.c
+++ b/lib/core/ogs-pkbuf.c
@@ -92,9 +92,9 @@ void ogs_pkbuf_default_init(ogs_pkbuf_config_t *config)
     ogs_assert(config);
     memset(config, 0, sizeof *config);
 
-    config->cluster_128_pool = 32768;
-    config->cluster_256_pool = 4096;
-    config->cluster_512_pool = 2048;
+    config->cluster_128_pool = 65536;
+    config->cluster_256_pool = 8192;
+    config->cluster_512_pool = 4096;
     config->cluster_1024_pool = 1024;
     config->cluster_2048_pool = 512;
     config->cluster_8192_pool = 128;