diff --git a/demo/records/subgraph/SushiswapV2Subgraph.json b/demo/records/subgraph/SushiswapV2Subgraph.json
index 0ffd07a..f99c511 100644
--- a/demo/records/subgraph/SushiswapV2Subgraph.json
+++ b/demo/records/subgraph/SushiswapV2Subgraph.json
@@ -3,9 +3,7 @@
   "version": "0.1.0",
   "schema": "",
   "name": "sushiswap-v2-subgraph",
-  "subgraphName": "sushiswap/v2-filecoin",
   "repository": "https://github.com/sushiswap/subgraphs",
   "repository_ref": "8a465f0b583a916debdbe357e1bb99205d8709f4",
-  "network": "filecoin",
-  "chain": "314"
+  "subgraph_dir": "subgraphs/v2"
 }
diff --git a/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json b/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json
index 0b93058..b632c9c 100644
--- a/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json
+++ b/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json
@@ -4,8 +4,11 @@
   "schema": "",
   "request": "",
   "name": "sushiswap-v2-subgraph",
+  "subgraphName": "sushiswap/v2-filecoin",
   "subgraph": "<subgraph-record-id>",
   "subgraph_id": "QmejnkeYZxJKxz6kV62V6mSmAKVDuyoiDsempRC6NMunYo",
+  "network": "filecoin",
+  "chain": "314",
   "url": "https://sushiswap-v2-subgraph-endpoint.example.com",
   "needs_auth": false
 }
diff --git a/demo/records/watcher/AjnaWatcher.json b/demo/records/watcher/AjnaWatcher.json
index f2ec2f8..45df775 100644
--- a/demo/records/watcher/AjnaWatcher.json
+++ b/demo/records/watcher/AjnaWatcher.json
@@ -6,6 +6,5 @@
   "repository": "https://git.vdb.to/cerc-io/ajna-watcher-ts",
   "repository_ref": "66b8d96308eacab1ef6a4f3cb74a0f28fb18dc67",
   "watcher_version": "0.1.3",
-  "is_subgraph_watcher": true,
-  "chain": "314"
+  "is_subgraph_watcher": true
 }
diff --git a/demo/records/watcher/AzimuthWatcher.json b/demo/records/watcher/AzimuthWatcher.json
index 7d4b4d0..3381dc9 100644
--- a/demo/records/watcher/AzimuthWatcher.json
+++ b/demo/records/watcher/AzimuthWatcher.json
@@ -6,6 +6,5 @@
   "repository": "https://github.com/cerc-io/azimuth-watcher-ts",
   "repository_ref": "ffd8baa4bcdd0b0fff701d942de572b7ddf33191",
   "watcher_version": "0.1.3",
-  "is_subgraph_watcher": false,
-  "chain": "1"
+  "is_subgraph_watcher": false
 }
diff --git a/demo/records/watcher/MerklSushiswapWatcher.json b/demo/records/watcher/MerklSushiswapWatcher.json
index 13fecbd..2efb169 100644
--- a/demo/records/watcher/MerklSushiswapWatcher.json
+++ b/demo/records/watcher/MerklSushiswapWatcher.json
@@ -6,6 +6,5 @@
   "repository": "https://github.com/cerc-io/merkl-sushiswap-v3-watcher-ts",
   "repository_ref": "b7cf79883e73400ad064b0357208c167795ab521",
   "watcher_version": "0.1.9",
-  "is_subgraph_watcher": true,
-  "chain": "314"
+  "is_subgraph_watcher": true
 }
diff --git a/demo/records/watcher/SushiswapWatcher.json b/demo/records/watcher/SushiswapWatcher.json
index 4687af5..c110a74 100644
--- a/demo/records/watcher/SushiswapWatcher.json
+++ b/demo/records/watcher/SushiswapWatcher.json
@@ -6,6 +6,5 @@
   "repository": "https://github.com/cerc-io/sushiswap-v3-watcher-ts",
   "repository_ref": "2f9f4d1ca191805922a51d1e3b471c06314fbc64",
   "watcher_version": "0.1.9",
-  "is_subgraph_watcher": true,
-  "chain": "314"
+  "is_subgraph_watcher": true
 }
diff --git a/demo/records/watcher/deployments/AjnaWatcherDeployment.json b/demo/records/watcher/deployments/AjnaWatcherDeployment.json
index 834a356..352f6d1 100644
--- a/demo/records/watcher/deployments/AjnaWatcherDeployment.json
+++ b/demo/records/watcher/deployments/AjnaWatcherDeployment.json
@@ -6,6 +6,7 @@
   "name": "ajna-watcher",
   "watcher": "<watcher-record-id>",
   "kind": "active",
+  "chain": "314",
   "url": "https://ajna-watcher-endpoint.example.com",
   "needs_auth": true
 }
diff --git a/demo/records/watcher/deployments/AzimuthWatcherDeployment.json b/demo/records/watcher/deployments/AzimuthWatcherDeployment.json
index 197b573..68a4e53 100644
--- a/demo/records/watcher/deployments/AzimuthWatcherDeployment.json
+++ b/demo/records/watcher/deployments/AzimuthWatcherDeployment.json
@@ -6,6 +6,7 @@
   "name": "azimuth-watcher",
   "watcher": "<watcher-record-id>",
   "kind": "active",
+  "chain": "1",
   "url": "https://azimuth-watcher-endpoint.example.com",
   "needs_auth": false
 }
diff --git a/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json b/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json
index b3ad954..bd1a56f 100644
--- a/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json
+++ b/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json
@@ -6,6 +6,7 @@
   "name": "merkl-sushiswap-v3-watcher",
   "watcher": "<watcher-record-id>",
   "kind": "active",
+  "chain": "314",
   "url": "https://merkl-sushiswap-v3-watcher-endpoint.example.com",
   "needs_auth": true
 }
diff --git a/demo/records/watcher/deployments/SushiswapWatcherDeployment.json b/demo/records/watcher/deployments/SushiswapWatcherDeployment.json
index 5a56139..aedbc0f 100644
--- a/demo/records/watcher/deployments/SushiswapWatcherDeployment.json
+++ b/demo/records/watcher/deployments/SushiswapWatcherDeployment.json
@@ -6,6 +6,7 @@
   "name": "sushiswap-v3-watcher",
   "watcher": "<watcher-record-id>",
   "kind": "active",
+  "chain": "314",
   "url": "https://sushiswap-v3-watcher-endpoint.example.com",
   "needs_auth": true
 }