diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8ad06c4443..43ad1c5b977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,10 @@
 ## Unreleased Changes
 
 ### Breaking Changes
+`--Xvalidators-builder-registration-default-gas-limit` is removed in favour of `--validators-builder-registration-default-gas-limit`
 
 ### Additions and Improvements
+- Default the gas limit to 36 million for externally produced blocks
 - Optimized blobs validation pipeline
 - Remove delay when fetching blobs from the local EL on block arrival
 
diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java
index ab9fd540dde..b5f75dc3f71 100644
--- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java
+++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java
@@ -83,7 +83,7 @@ void shouldMaintainValidatorsInMutableClient() throws Exception {
     api.assertLocalValidatorListing(validatorKeystores.getPublicKeys());
 
     api.assertValidatorGasLimit(
-        validatorKeystores.getPublicKeys().get(1), UInt64.valueOf(30000000));
+        validatorKeystores.getPublicKeys().get(1), UInt64.valueOf(36_000_000));
 
     // generate voluntary exit
     api.generateVoluntaryExitAndCheckValidatorIndex(validatorKeystores.getPublicKeys().get(1), 1);
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java
index ddfa860b4df..165bc95e30c 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java
@@ -60,12 +60,11 @@ public class ValidatorProposerOptions {
       ValidatorConfig.DEFAULT_BUILDER_REGISTRATION_DEFAULT_ENABLED;
 
   @Option(
-      names = {"--Xvalidators-builder-registration-default-gas-limit"},
+      names = {"--validators-builder-registration-default-gas-limit"},
       paramLabel = "<uint64>",
       showDefaultValue = Visibility.ALWAYS,
       description = "Change the default gas limit used for the validators registration.",
       arity = "1",
-      hidden = true,
       converter = UInt64Converter.class)
   private UInt64 builderRegistrationDefaultGasLimit =
       ValidatorConfig.DEFAULT_BUILDER_REGISTRATION_GAS_LIMIT;
diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java
index c3ca6e4a966..11229684439 100644
--- a/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java
+++ b/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java
@@ -197,7 +197,7 @@ public void shouldReportDefaultGasLimitIfRegistrationDefaultGasLimitNotSpecified
 
   @Test
   public void shouldSetDefaultGasLimitIfRegistrationDefaultGasLimitIsSpecified() {
-    final String[] args = {"--Xvalidators-builder-registration-default-gas-limit", "1000"};
+    final String[] args = {"--validators-builder-registration-default-gas-limit", "1000"};
     final TekuConfiguration config = getTekuConfigurationFromArguments(args);
     assertThat(
             config.validatorClient().getValidatorConfig().getBuilderRegistrationDefaultGasLimit())
diff --git a/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java b/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java
index 059d5487435..623c752e9c7 100644
--- a/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java
+++ b/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java
@@ -68,7 +68,7 @@ public class ValidatorConfig {
   public static final boolean DEFAULT_BUILDER_REGISTRATION_DEFAULT_ENABLED = false;
   public static final boolean DEFAULT_VALIDATOR_BLINDED_BLOCKS_ENABLED = false;
   public static final int DEFAULT_VALIDATOR_REGISTRATION_SENDING_BATCH_SIZE = 100;
-  public static final UInt64 DEFAULT_BUILDER_REGISTRATION_GAS_LIMIT = UInt64.valueOf(30_000_000);
+  public static final UInt64 DEFAULT_BUILDER_REGISTRATION_GAS_LIMIT = UInt64.valueOf(36_000_000);
   public static final boolean DEFAULT_OBOL_DVT_SELECTIONS_ENDPOINT_ENABLED = false;
   public static final boolean DEFAULT_ATTESTATIONS_V2_APIS_ENABLED = false;