diff --git a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
index ab50c72a..0f9b5d8f 100644
--- a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -135,8 +133,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -217,8 +213,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml b/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
index 425ddebc..e4a4809d 100644
--- a/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -134,8 +132,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -216,8 +212,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-mainnet-op-geth-pruned-pebble-hash.yml b/op/geth/celo-mainnet-op-geth-pruned-pebble-hash.yml
index 4b51da63..3d686342 100644
--- a/op/geth/celo-mainnet-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-pebble-hash.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -132,8 +130,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -214,8 +210,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
index c0d10d14..313de700 100644
--- a/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-pebble-path.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -132,8 +130,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=mainnet
@@ -214,8 +210,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x870679e138bcdf293b7ff14dd44b70fc97e12fc0
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0xEC35aa6521d23479318104E10B4aA216DBBE63Ce
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0xE1Ae45810A738F13e70Ac8966354d7D0feCF7BD6
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0x2ea418AE1852bfC79e18B37E55F278F9c598AA08
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-sepolia-op-geth-archive-leveldb-hash.yml b/op/geth/celo-sepolia-op-geth-archive-leveldb-hash.yml
index cb33efe6..457b135b 100644
--- a/op/geth/celo-sepolia-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-sepolia-op-geth-archive-leveldb-hash.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -133,8 +131,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -216,8 +212,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-sepolia-op-geth-archive-pebble-hash.yml b/op/geth/celo-sepolia-op-geth-archive-pebble-hash.yml
index a3dfb848..828d5532 100644
--- a/op/geth/celo-sepolia-op-geth-archive-pebble-hash.yml
+++ b/op/geth/celo-sepolia-op-geth-archive-pebble-hash.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -133,8 +131,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -216,8 +212,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-sepolia-op-geth-archive-pebble-path.yml b/op/geth/celo-sepolia-op-geth-archive-pebble-path.yml
index 183c5750..5e78bc84 100644
--- a/op/geth/celo-sepolia-op-geth-archive-pebble-path.yml
+++ b/op/geth/celo-sepolia-op-geth-archive-pebble-path.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -133,8 +131,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -216,8 +212,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-sepolia-op-geth-pruned-pebble-hash.yml b/op/geth/celo-sepolia-op-geth-pruned-pebble-hash.yml
index c5d95ce7..6d540d62 100644
--- a/op/geth/celo-sepolia-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/celo-sepolia-op-geth-pruned-pebble-hash.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -133,8 +131,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -216,8 +212,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4
diff --git a/op/geth/celo-sepolia-op-geth-pruned-pebble-path.yml b/op/geth/celo-sepolia-op-geth-pruned-pebble-path.yml
index 9d5c6882..a0606451 100644
--- a/op/geth/celo-sepolia-op-geth-pruned-pebble-path.yml
+++ b/op/geth/celo-sepolia-op-geth-pruned-pebble-path.yml
@@ -55,8 +55,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -133,8 +131,6 @@ services:
     environment:
       - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_NETWORK=sepolia_testnet
@@ -216,8 +212,6 @@ services:
       - EIGENDA_PROXY_EIGENDA_MAX_BLOB_LENGTH=16MiB
       - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0x3a5acf46ba6890B8536420F4900AC9BC45Df4764
       - EIGENDA_PROXY_EIGENDA_STATUS_QUERY_TIMEOUT=45m
-      - EIGENDA_PROXY_EIGENDA_V2_BLS_OPERATOR_STATE_RETRIEVER_ADDR=0x22478d082E9edaDc2baE8443E4aC9473F6E047Ff
-      - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ADDR=0x73818fed0743085c4557a736a7630447fb57c662
       - EIGENDA_PROXY_EIGENDA_V2_CERT_VERIFIER_ROUTER_OR_IMMUTABLE_VERIFIER_ADDR=0xf4f934A0b5c09d302d9C6f60040754fEebdd6073
       - EIGENDA_PROXY_EIGENDA_V2_DISPERSER_RPC=disperser-testnet-sepolia.eigenda.xyz:443
       - EIGENDA_PROXY_EIGENDA_V2_EIGENDA_DIRECTORY=0x64AB2e9A86FA2E183CB6f01B2D4050c1c2dFAad4