diff --git a/docs/pages/run/validator-management/proposer-config.md b/docs/pages/run/validator-management/proposer-config.md
index 444789a9f8b0..38769ebc1878 100644
--- a/docs/pages/run/validator-management/proposer-config.md
+++ b/docs/pages/run/validator-management/proposer-config.md
@@ -15,7 +15,7 @@ proposer_config:
     strict_fee_recipient_check: false
     fee_recipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     builder:
-      gas_limit: "30000000"
+      gas_limit: "36000000"
       selection: "executionalways"
       boost_factor: "0"
   "0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d":
@@ -29,7 +29,7 @@ default_config:
   strict_fee_recipient_check: true
   fee_recipient: "0xcccccccccccccccccccccccccccccccccccccccc"
   builder:
-    gas_limit: "30000000"
+    gas_limit: "36000000"
     selection: "default"
     boost_factor: "90"
 ```
diff --git a/packages/api/test/unit/keymanager/testData.ts b/packages/api/test/unit/keymanager/testData.ts
index 6b17611d1e0b..f954eea7aae1 100644
--- a/packages/api/test/unit/keymanager/testData.ts
+++ b/packages/api/test/unit/keymanager/testData.ts
@@ -12,7 +12,7 @@ import {GenericServerTestCases} from "../../utils/genericServerTest.js";
 const pubkeyRand = "0x84105a985058fc8740a48bf1ede9d223ef09e8c6b1735ba0a55cf4a9ff2ff92376b778798365e488dab07a652eb04576";
 const ethaddressRand = "0xabcf8e0d4e9587369b2301d0790347320302cc09";
 const graffitiRandUtf8 = "636861696e736166652f6c6f64657374";
-const gasLimitRand = 30_000_000;
+const gasLimitRand = 36_000_000;
 const builderBoostFactorRand = BigInt(100);
 
 export const testData: GenericServerTestCases<Endpoints> = {
diff --git a/packages/beacon-node/test/sim/electra-interop.test.ts b/packages/beacon-node/test/sim/electra-interop.test.ts
index 148f210f7f65..c46f5179e079 100644
--- a/packages/beacon-node/test/sim/electra-interop.test.ts
+++ b/packages/beacon-node/test/sim/electra-interop.test.ts
@@ -158,7 +158,7 @@ describe("executionEngine / ExecutionEngineHttp", () => {
         256
       ),
       prevRandao: dataToBytes("0x0000000000000000000000000000000000000000000000000000000000000000", 32),
-      gasLimit: 30000000,
+      gasLimit: 36000000,
       gasUsed: 84714,
       timestamp: 16,
       extraData: dataToBytes("0x", 0),
diff --git a/packages/cli/test/e2e/propserConfigfromKeymanager.test.ts b/packages/cli/test/e2e/propserConfigfromKeymanager.test.ts
index 26bf3e618c2b..e30d65178c7a 100644
--- a/packages/cli/test/e2e/propserConfigfromKeymanager.test.ts
+++ b/packages/cli/test/e2e/propserConfigfromKeymanager.test.ts
@@ -16,13 +16,13 @@ describe("import keystores from api, test DefaultProposerConfig", () => {
 
   const defaultOptions = {
     suggestedFeeRecipient: "0x0000000000000000000000000000000000000000",
-    gasLimit: 30_000_000,
+    gasLimit: 36_000_000,
     graffiti: "aaaa",
   };
 
   const updatedOptions = {
     suggestedFeeRecipient: "0xcccccccccccccccccccccccccccccccccccccccc",
-    gasLimit: 35_000_000,
+    gasLimit: 40_000_000,
     graffiti: "bbbb",
   };
 
diff --git a/packages/cli/test/unit/validator/parseProposerConfig.test.ts b/packages/cli/test/unit/validator/parseProposerConfig.test.ts
index f10d5d7cc080..42138dbe7d28 100644
--- a/packages/cli/test/unit/validator/parseProposerConfig.test.ts
+++ b/packages/cli/test/unit/validator/parseProposerConfig.test.ts
@@ -14,7 +14,7 @@ const testValue = {
       strictFeeRecipientCheck: true,
       feeRecipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       builder: {
-        gasLimit: 30000000,
+        gasLimit: 36000000,
         selection: undefined,
         boostFactor: undefined,
       },
@@ -35,7 +35,7 @@ const testValue = {
     strictFeeRecipientCheck: true,
     feeRecipient: "0xcccccccccccccccccccccccccccccccccccccccc",
     builder: {
-      gasLimit: 30000000,
+      gasLimit: 36000000,
       selection: routes.validator.BuilderSelection.MaxProfit,
       boostFactor: BigInt(50),
     },
diff --git a/packages/cli/test/unit/validator/proposerConfigs/invalidData.yaml b/packages/cli/test/unit/validator/proposerConfigs/invalidData.yaml
index 361a8aee0a68..63dca6d46eae 100644
--- a/packages/cli/test/unit/validator/proposerConfigs/invalidData.yaml
+++ b/packages/cli/test/unit/validator/proposerConfigs/invalidData.yaml
@@ -1,20 +1,20 @@
 proposer_config:
-  '0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c':
+  "0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c":
     graffiti: 123
     strict_fee_recipient_check: "true"
-    fee_recipient: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    fee_recipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     builder:
       enabled: true
-      gas_limit: "30000000"
-  '0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d':
-    fee_recipient: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+      gas_limit: "36000000"
+  "0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d":
+    fee_recipient: "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
     builder:
       enabled: "true"
       gas_limit: "35000000"
 default_config:
-  graffiti: 'default graffiti'
+  graffiti: "default graffiti"
   strict_fee_recipient_check: true
-  fee_recipient: '0xcccccccccccccccccccccccccccccccccccccccc'
+  fee_recipient: "0xcccccccccccccccccccccccccccccccccccccccc"
   builder:
     enabled: true
-    gas_limit: "30000000"
+    gas_limit: "36000000"
diff --git a/packages/cli/test/unit/validator/proposerConfigs/validData.yaml b/packages/cli/test/unit/validator/proposerConfigs/validData.yaml
index 71dabb9d900d..9532ed4ce008 100644
--- a/packages/cli/test/unit/validator/proposerConfigs/validData.yaml
+++ b/packages/cli/test/unit/validator/proposerConfigs/validData.yaml
@@ -1,21 +1,21 @@
 proposer_config:
-  '0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c':
-    graffiti: 'graffiti'
+  "0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c":
+    graffiti: "graffiti"
     strict_fee_recipient_check: true
-    fee_recipient: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    fee_recipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     builder:
-      gas_limit: "30000000"
-  '0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d':
-    fee_recipient: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+      gas_limit: "36000000"
+  "0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d":
+    fee_recipient: "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
     builder:
       gas_limit: "35000000"
       selection: "builderalways"
       boost_factor: "18446744073709551616"
 default_config:
-  graffiti: 'default graffiti'
+  graffiti: "default graffiti"
   strict_fee_recipient_check: "true"
-  fee_recipient: '0xcccccccccccccccccccccccccccccccccccccccc'
+  fee_recipient: "0xcccccccccccccccccccccccccccccccccccccccc"
   builder:
-    gas_limit: "30000000"
+    gas_limit: "36000000"
     selection: "maxprofit"
     boost_factor: "50"
diff --git a/packages/validator/src/services/validatorStore.ts b/packages/validator/src/services/validatorStore.ts
index e80c0b291ef5..7e052fbd73f1 100644
--- a/packages/validator/src/services/validatorStore.ts
+++ b/packages/validator/src/services/validatorStore.ts
@@ -131,7 +131,7 @@ type ValidatorData = ProposerConfig & {
 
 export const defaultOptions = {
   suggestedFeeRecipient: "0x0000000000000000000000000000000000000000",
-  defaultGasLimit: 30_000_000,
+  defaultGasLimit: 36_000_000,
   builderSelection: routes.validator.BuilderSelection.ExecutionOnly,
   builderAliasSelection: routes.validator.BuilderSelection.Default,
   builderBoostFactor: BigInt(100),
diff --git a/packages/validator/test/unit/validatorStore.test.ts b/packages/validator/test/unit/validatorStore.test.ts
index d32acf41647a..aa89f3927259 100644
--- a/packages/validator/test/unit/validatorStore.test.ts
+++ b/packages/validator/test/unit/validatorStore.test.ts
@@ -26,7 +26,7 @@ describe("ValidatorStore", () => {
           strictFeeRecipientCheck: true,
           feeRecipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           builder: {
-            gasLimit: 30000000,
+            gasLimit: 36000000,
             selection: routes.validator.BuilderSelection.ExecutionOnly,
           },
         },