diff --git a/configs/mainnet/phase1.yaml b/configs/mainnet/phase1.yaml
index 399192113..c3a4f93b9 100644
--- a/configs/mainnet/phase1.yaml
+++ b/configs/mainnet/phase1.yaml
@@ -28,6 +28,10 @@ TARGET_SHARD_BLOCK_SIZE: 262144
 SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]
 # len(SHARD_BLOCK_OFFSETS)
 MAX_SHARD_BLOCKS_PER_ATTESTATION: 12
+# 2**12 (= 4,096)
+BYTES_PER_CUSTODY_CHUNK: 4096
+# ceillog2(MAX_SHARD_BLOCK_SIZE // BYTES_PER_CUSTODY_CHUNK)
+CUSTODY_RESPONSE_DEPTH: 8
 
 # Gwei values
 # 2**14 (= 16,384) Gwei
@@ -41,6 +45,10 @@ ONLINE_PERIOD: 8
 # 2**8 (= 256) | epochs
 LIGHT_CLIENT_COMMITTEE_PERIOD: 256
 
+# Max operations per block
+# 2**20 (= 1,048,576) 
+MAX_CUSTODY_CHUNK_CHALLENGE_RECORDS: 1048576
+
 # Domain types
 DOMAIN_SHARD_PROPOSAL: 0x80000000
 DOMAIN_SHARD_COMMITTEE: 0x81000000
diff --git a/configs/minimal/phase1.yaml b/configs/minimal/phase1.yaml
index 68e60aa87..5e570d646 100644
--- a/configs/minimal/phase1.yaml
+++ b/configs/minimal/phase1.yaml
@@ -30,6 +30,10 @@ TARGET_SHARD_BLOCK_SIZE: 262144
 SHARD_BLOCK_OFFSETS: [1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]
 # len(SHARD_BLOCK_OFFSETS)
 MAX_SHARD_BLOCKS_PER_ATTESTATION: 12
+# 2**12 (= 4,096)
+BYTES_PER_CUSTODY_CHUNK: 4096
+# ceillog2(MAX_SHARD_BLOCK_SIZE // BYTES_PER_CUSTODY_CHUNK)
+CUSTODY_RESPONSE_DEPTH: 8
 
 # Gwei values
 # 2**14 (= 16,384) Gwei
@@ -43,6 +47,10 @@ ONLINE_PERIOD: 8
 # 2**8 (= 256) | epochs
 LIGHT_CLIENT_COMMITTEE_PERIOD: 256
 
+# Max operations per block
+# 2**20 (= 1,048,576) 
+MAX_CUSTODY_CHUNK_CHALLENGE_RECORDS: 1048576
+
 # Domain types
 DOMAIN_SHARD_PROPOSAL: 0x80000000
 DOMAIN_SHARD_COMMITTEE: 0x81000000
@@ -58,11 +66,11 @@ DOMAIN_CUSTODY_BIT_SLASHING: 0x83000000
 RANDAO_PENALTY_EPOCHS: 2
 # [customized] quicker for testing
 EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 4096
-# [customized] quickerquicker for testing
+# [customized] quicker for testing
 EPOCHS_PER_CUSTODY_PERIOD: 8
-# [customized] quickerquicker for testing
+# [customized] quicker for testing
 CUSTODY_PERIOD_TO_RANDAO_PADDING: 8
-# [customized] quickerquicker for testing
+# [customized] quicker for testing
 CUSTODY_RESPONSE_DEADLINE: 32
 
 # Max operations
diff --git a/specs/phase1/beacon-chain.md b/specs/phase1/beacon-chain.md
index 61e30e102..dbfbde897 100644
--- a/specs/phase1/beacon-chain.md
+++ b/specs/phase1/beacon-chain.md
@@ -16,6 +16,7 @@
   - [Gwei values](#gwei-values)
   - [Initial values](#initial-values)
   - [Time parameters](#time-parameters)
+  - [Max operations per block](#max-operations-per-block)
   - [Domain types](#domain-types)
 - [Updated containers](#updated-containers)
   - [Extended `AttestationData`](#extended-attestationdata)
@@ -116,12 +117,14 @@ Configuration is not namespaced. Instead it is strictly an extension;
 
 ### Shard block configs
 
-| Name | Value |
-| - | - |
-| `MAX_SHARD_BLOCK_SIZE` | `2**20` (= 1,048,576) | 
-| `TARGET_SHARD_BLOCK_SIZE` | `2**18` (= 262,144) | 
-| `SHARD_BLOCK_OFFSETS` | `[1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]` | 
-| `MAX_SHARD_BLOCKS_PER_ATTESTATION` | `len(SHARD_BLOCK_OFFSETS)` | 
+| Name | Value | Unit |
+| - | - | - |
+| `MAX_SHARD_BLOCK_SIZE` | `2**20` (= 1,048,576) | bytes |
+| `TARGET_SHARD_BLOCK_SIZE` | `2**18` (= 262,144) |  bytes |
+| `SHARD_BLOCK_OFFSETS` | `[1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]` | - |
+| `MAX_SHARD_BLOCKS_PER_ATTESTATION` | `len(SHARD_BLOCK_OFFSETS)` | - |
+| `BYTES_PER_CUSTODY_CHUNK` | `2**12` (= 4,096) | bytes |
+| `CUSTODY_RESPONSE_DEPTH` | `ceillog2(MAX_SHARD_BLOCK_SIZE // BYTES_PER_CUSTODY_CHUNK)` | - | 
 
 ### Gwei values
 
@@ -142,20 +145,11 @@ Configuration is not namespaced. Instead it is strictly an extension;
 | - | - | :-: | :-: |
 | `ONLINE_PERIOD` | `OnlineEpochs(2**3)` (= 8) | online epochs | ~51 mins |
 | `LIGHT_CLIENT_COMMITTEE_PERIOD` | `Epoch(2**8)` (= 256) | epochs | ~27 hours |
-| `MAX_SHARD_BLOCK_SIZE` | `2**20` (= 1,048,576) | bytes | - |
-| `TARGET_SHARD_BLOCK_SIZE` | `2**18` (= 262,144) | bytes | - |
-| `SHARD_BLOCK_OFFSETS` | `[1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233]` | list of slot offsets | - |
-| `MAX_SHARD_BLOCKS_PER_ATTESTATION` | `len(SHARD_BLOCK_OFFSETS)` | - | - |
-| `MAX_GASPRICE` | `Gwei(2**14)` (= 16,384) | Gwei | |
-| `MIN_GASPRICE` | `Gwei(2**3)` (= 8) | Gwei | |
-| `GASPRICE_ADJUSTMENT_COEFFICIENT` | `2**3` (= 8) | | |
-| `DOMAIN_SHARD_PROPOSAL` | `DomainType('0x80000000')` | | |
-| `DOMAIN_SHARD_COMMITTEE` | `DomainType('0x81000000')` | | |
-| `DOMAIN_LIGHT_CLIENT` | `DomainType('0x82000000')` | | |
-| `MAX_CUSTODY_CHUNK_CHALLENGE_RECORDS` | `2**20` (= 1,048,576) | | |
-| `BYTES_PER_CUSTODY_CHUNK` | `2**12` | bytes | |
-| `CUSTODY_RESPONSE_DEPTH` | `ceillog2(MAX_SHARD_BLOCK_SIZE // BYTES_PER_CUSTODY_CHUNK)` | - | - |
-| `NO_SIGNATURE` | `BLSSignature(b'\x00' * 96)` | | |
+
+### Max operations per block
+| Name | Value |
+| - | - |
+| `MAX_CUSTODY_CHUNK_CHALLENGE_RECORDS` | `2**20` (= 1,048,576) |
 
 ### Domain types