diff --git a/crates/json-oracle-encoder/src/abi/submitConfigABI.json b/crates/json-oracle-encoder/src/abi/submitConfigABI.json
index 43cc88f..19c3237 100644
--- a/crates/json-oracle-encoder/src/abi/submitConfigABI.json
+++ b/crates/json-oracle-encoder/src/abi/submitConfigABI.json
@@ -14,7 +14,8 @@
             {"name": "period", "type": "string"},
             {"name": "gracePeriod", "type": "string"},
             {"name": "supportedDataSourceKinds", "type": "string"},
-            {"name": "subgraph", "type": "string"},
+            {"name": "networkSubgraphId", "type": "string"},
+            {"name": "epochBlockOracleSubgraphId", "type": "string"},
             {"name": "subgraphAvailabilityManagerContract", "type": "string"},
             {"name": "oracleIndex", "type": "string"}
           ],
diff --git a/crates/json-oracle-encoder/src/lib.rs b/crates/json-oracle-encoder/src/lib.rs
index 16f8bf8..e158517 100644
--- a/crates/json-oracle-encoder/src/lib.rs
+++ b/crates/json-oracle-encoder/src/lib.rs
@@ -11,7 +11,8 @@ struct Config {
     period: String,
     grace_period: String,
     supported_data_source_kinds: String,
-    subgraph: String,
+    network_subgraph_id: String,
+    epoch_block_oracle_subgraph_id: String,
     subgraph_availability_manager_contract: String,
     oracle_index: String,
 }
@@ -37,7 +38,8 @@ pub fn json_to_calldata(json: serde_json::Value) -> anyhow::Result<Vec<u8>> {
             Token::String(data.config.period),
             Token::String(data.config.grace_period),
             Token::String(data.config.supported_data_source_kinds),
-            Token::String(data.config.subgraph),
+            Token::String(data.config.network_subgraph_id),
+            Token::String(data.config.epoch_block_oracle_subgraph_id),
             Token::String(data.config.subgraph_availability_manager_contract),
             Token::String(data.config.oracle_index),
         ]),
diff --git a/json-encoder-web/index.ts b/json-encoder-web/index.ts
index 98c2dd8..223083c 100644
--- a/json-encoder-web/index.ts
+++ b/json-encoder-web/index.ts
@@ -15,7 +15,8 @@ const samplePayload = `{
 		"period": "300",
 		"grace_period": "0",
 		"supported_data_source_kinds": "ethereum,ethereum/contract,file/ipfs,substreams,file/arweave",
-		"subgraph": "https://api.thegraph.com/subgraphs/name/graphprotocol/graph-network-arbitrum",
+		"network_subgraph_id": "Fg36gCZE7pXEuZ3p8sxYzFE5UbgHtk7kcJiC5HBbfgmY",
+		"epoch_block_oracle_subgraph_id": "4KFYqUWRTZQ9gn7GPHC6YQ2q15chJfVrX43ezYcwkgxB",
 		"subgraph_availability_manager_contract": "CONTRACT_ADDRESS",
 		"oracle_index": "ORACLE_INDEX"
 	}