diff --git a/docs/getting_started/build-options.rst b/docs/getting_started/build-options.rst
index be38e1561..203bf0f7d 100644
--- a/docs/getting_started/build-options.rst
+++ b/docs/getting_started/build-options.rst
@@ -848,7 +848,7 @@ Common build options
 -  ``RME_GPT_MAX_BLOCK``: Numeric value in MB to define the maximum size of
    supported contiguous blocks in GPT Library. This parameter can take the
    values 0, 2, 32 and 512. Setting this value to 0 disables use of Contigious
-   descriptors. Default value is 2.
+   descriptors. Default value is 512.
 
 -  ``ROT_KEY``: This option is used when ``GENERATE_COT=1``. It specifies a
    file that contains the ROT private key in PEM format or a PKCS11 URI and
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk
index 290a6feed..8c884b4de 100644
--- a/make_helpers/defaults.mk
+++ b/make_helpers/defaults.mk
@@ -146,7 +146,7 @@ GENERATE_COT			:= 0
 RME_GPT_BITLOCK_BLOCK		:= 1
 
 # Default maximum size of GPT contiguous block
-RME_GPT_MAX_BLOCK		:= 2
+RME_GPT_MAX_BLOCK		:= 512
 
 # Hint platform interrupt control layer that Group 0 interrupts are for EL3. By
 # default, they are for Secure EL1.