diff --git a/demo/README.md b/demo/README.md
index 61cf45f..b826d15 100644
--- a/demo/README.md
+++ b/demo/README.md
@@ -36,6 +36,7 @@
 
   ```bash
   # Publishes records and corresponding 'deployment' records
+  # In laconic-registry-cli
   yarn ts-node demo/scripts/publish-records.ts --config config.yml --records demo/records
   ```
 
@@ -75,12 +76,12 @@
     laconic registry record list --all --type SubgraphDeploymentRecord subgraph $SUBGRAPH_RECORD_ID | jq -r '.[].attributes.url'
     ```
 
-* Query for `geth-rpc` service deployment(s):
+* Query for `geth` service deployment(s):
 
-  * Find the `ServiceRecord` for `geth-rpc`:
+  * Find the `ServiceRecord` for `geth`:
 
     ```bash
-    SERVICE_RECORD_ID=$(laconic registry record list --all --type ServiceRecord --name geth-rpc | jq -r '.[].id')
+    SERVICE_RECORD_ID=$(laconic registry record list --all --type ServiceRecord --name geth | jq -r '.[].id')
     ```
 
   * Find corresponding deployment(s):
diff --git a/demo/records/service/Geth.json b/demo/records/service/Geth.json
new file mode 100644
index 0000000..8d7ff5e
--- /dev/null
+++ b/demo/records/service/Geth.json
@@ -0,0 +1,9 @@
+{
+  "type": "ServiceRecord",
+  "version": "0.1.0",
+  "schema": "",
+  "name": "geth",
+  "repository": "https://git.vdb.to/cerc-io/plugeth",
+  "repository_ref": "c50b6cc026207b195ad7f9afdbe919a1fe676e67",
+  "repository_tag": "v1.13.14-cerc-0"
+}
diff --git a/demo/records/service/GethRPC.json b/demo/records/service/GethRPC.json
deleted file mode 100644
index 4223258..0000000
--- a/demo/records/service/GethRPC.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "type": "ServiceRecord",
-  "version": "0.1.0",
-  "schema": "",
-  "name": "geth-rpc",
-  "repository": "https://github.com/ethereum/go-ethereum",
-  "repository_ref": "87246f3cbaf10f83f56bc4d45f0f3e36e83e71e9",
-  "repository_tag": "v1.14.0"
-}
diff --git a/demo/records/service/Lotus.json b/demo/records/service/Lotus.json
new file mode 100644
index 0000000..393915e
--- /dev/null
+++ b/demo/records/service/Lotus.json
@@ -0,0 +1,9 @@
+{
+  "type": "ServiceRecord",
+  "version": "0.1.0",
+  "schema": "",
+  "name": "lotus",
+  "repository": "https://git.vdb.to/cerc-io/lotus",
+  "repository_ref": "9dc9a5cf45acc7ee86371af2092dd7c04db26930",
+  "repository_tag": "v1.26.1"
+}
diff --git a/demo/records/service/LotusRPC.json b/demo/records/service/LotusRPC.json
deleted file mode 100644
index c75260a..0000000
--- a/demo/records/service/LotusRPC.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "type": "ServiceRecord",
-  "version": "0.1.0",
-  "schema": "",
-  "name": "lotus-rpc",
-  "repository": "https://github.com/filecoin-project/lotus",
-  "repository_ref": "560826d5c61405006603c4f3d734a586a856d865",
-  "repository_tag": "v1.26.3"
-}
diff --git a/demo/records/service/deployments/SandmanLotusRPCDeployment.json b/demo/records/service/deployments/ArchiveLotusDeployment.json
similarity index 60%
rename from demo/records/service/deployments/SandmanLotusRPCDeployment.json
rename to demo/records/service/deployments/ArchiveLotusDeployment.json
index eb08e55..8ff94e8 100644
--- a/demo/records/service/deployments/SandmanLotusRPCDeployment.json
+++ b/demo/records/service/deployments/ArchiveLotusDeployment.json
@@ -3,12 +3,14 @@
   "version": "0.1.0",
   "schema": "",
   "request": "",
-  "name": "lotus-rpc",
+  "name": "lotus",
   "service": "<service-record-id>",
-  "node_name": "",
-  "chain": "314",
   "url": "https://lotus-rpc-endpoint.example.com",
   "needs_auth": false,
-  "node_type": "lite",
-  "eth_rpc_enabled": true
+  "meta": {
+    "machine_name": "",
+    "node_type": "archive",
+    "chain": "314",
+    "eth_rpc_enabled": true
+  }
 }
diff --git a/demo/records/service/deployments/KindredGethRPCDeployment.json b/demo/records/service/deployments/GibbonGethDeployment.json
similarity index 54%
rename from demo/records/service/deployments/KindredGethRPCDeployment.json
rename to demo/records/service/deployments/GibbonGethDeployment.json
index a1baf94..45e755d 100644
--- a/demo/records/service/deployments/KindredGethRPCDeployment.json
+++ b/demo/records/service/deployments/GibbonGethDeployment.json
@@ -3,12 +3,14 @@
   "version": "0.1.0",
   "schema": "",
   "request": "",
-  "name": "geth-rpc",
+  "name": "geth",
   "service": "<service-record-id>",
-  "node_name": "Geth/kindred-laconic/v1.14.0-unstable-3c26ffeb/linux-amd64/go1.21.8",
-  "chain": "1",
   "url": "https://geth-rpc-endpoint.example.com",
   "needs_auth": false,
-  "sync_mode": "full",
-  "gc_mode": "archive"
+  "meta": {
+    "machine_name": "gibbon",
+    "chain": "1",
+    "sync_mode": "snap",
+    "gc_mode": "archive"
+  }
 }
diff --git a/demo/records/service/deployments/GibbonGethRPCDeployment.json b/demo/records/service/deployments/KindredGethDeployment.json
similarity index 53%
rename from demo/records/service/deployments/GibbonGethRPCDeployment.json
rename to demo/records/service/deployments/KindredGethDeployment.json
index 7099c3c..3c24e15 100644
--- a/demo/records/service/deployments/GibbonGethRPCDeployment.json
+++ b/demo/records/service/deployments/KindredGethDeployment.json
@@ -3,12 +3,14 @@
   "version": "0.1.0",
   "schema": "",
   "request": "",
-  "name": "geth-rpc",
+  "name": "geth",
   "service": "<service-record-id>",
-  "node_name": "Geth/kindred-laconic-snap/v1.14.0-unstable-2e06fbd4/linux-amd64/go1.22.2",
-  "chain": "1",
   "url": "https://geth-rpc-endpoint.example.com",
   "needs_auth": false,
-  "sync_mode": "snap",
-  "gc_mode": "archive"
+  "meta": {
+    "machine_name": "kindred",
+    "chain": "1",
+    "sync_mode": "full",
+    "gc_mode": "archive"
+  }
 }
diff --git a/demo/records/service/deployments/ArchiveLotusRPCDeployment.json b/demo/records/service/deployments/SandmanLotusDeployment.json
similarity index 59%
rename from demo/records/service/deployments/ArchiveLotusRPCDeployment.json
rename to demo/records/service/deployments/SandmanLotusDeployment.json
index db9112f..977fb33 100644
--- a/demo/records/service/deployments/ArchiveLotusRPCDeployment.json
+++ b/demo/records/service/deployments/SandmanLotusDeployment.json
@@ -3,12 +3,14 @@
   "version": "0.1.0",
   "schema": "",
   "request": "",
-  "name": "lotus-rpc",
+  "name": "lotus",
   "service": "<service-record-id>",
-  "node_name": "",
-  "chain": "314",
   "url": "https://lotus-rpc-endpoint.example.com",
   "needs_auth": false,
-  "node_type": "full",
-  "eth_rpc_enabled": true
+  "meta": {
+    "machine_name": "sandman",
+    "node_type": "full",
+    "chain": "314",
+    "eth_rpc_enabled": true
+  }
 }
diff --git a/demo/records/subgraph/SushiswapBlocksSubgraph.json b/demo/records/subgraph/SushiswapBlocksSubgraph.json
index 0f7c830..2c7f942 100644
--- a/demo/records/subgraph/SushiswapBlocksSubgraph.json
+++ b/demo/records/subgraph/SushiswapBlocksSubgraph.json
@@ -5,5 +5,6 @@
   "name": "sushiswap-blocks-subgraph",
   "repository": "https://github.com/sushiswap/subgraphs",
   "repository_ref": "533749731563023903410a58013167bc10d06a88",
+  "repository_tag": "",
   "subgraph_dir": "subgraphs/blocks"
 }
diff --git a/demo/records/subgraph/SushiswapRouteProcessorSubgraph.json b/demo/records/subgraph/SushiswapRouteProcessorSubgraph.json
index 62d109e..a826587 100644
--- a/demo/records/subgraph/SushiswapRouteProcessorSubgraph.json
+++ b/demo/records/subgraph/SushiswapRouteProcessorSubgraph.json
@@ -5,5 +5,6 @@
   "name": "sushiswap-route-processor-subgraph",
   "repository": "https://github.com/sushiswap/subgraphs",
   "repository_ref": "382f888489ffc27d394775f9c1719dba7bacef63",
+  "repository_tag": "",
   "subgraph_dir": "subgraphs/route-processor"
 }
diff --git a/demo/records/subgraph/SushiswapSubgraph.json b/demo/records/subgraph/SushiswapSubgraph.json
index 78cb878..ca7b666 100644
--- a/demo/records/subgraph/SushiswapSubgraph.json
+++ b/demo/records/subgraph/SushiswapSubgraph.json
@@ -5,5 +5,6 @@
   "name": "sushiswap-subgraph",
   "repository": "https://github.com/sushiswap/subgraphs",
   "repository_ref": "533749731563023903410a58013167bc10d06a88",
+  "repository_tag": "",
   "subgraph_dir": "subgraphs/sushiswap"
 }
diff --git a/demo/records/subgraph/SushiswapV2Subgraph.json b/demo/records/subgraph/SushiswapV2Subgraph.json
index d932985..d68fcfb 100644
--- a/demo/records/subgraph/SushiswapV2Subgraph.json
+++ b/demo/records/subgraph/SushiswapV2Subgraph.json
@@ -5,5 +5,6 @@
   "name": "sushiswap-v2-subgraph",
   "repository": "https://github.com/sushiswap/subgraphs",
   "repository_ref": "d491b69adb9ff3666162ac284ab77a146f231794",
+  "repository_tag": "",
   "subgraph_dir": "subgraphs/v2"
 }
diff --git a/demo/records/subgraph/SushiswapV3Subgraph.json b/demo/records/subgraph/SushiswapV3Subgraph.json
index b9a9f3c..09fc58f 100644
--- a/demo/records/subgraph/SushiswapV3Subgraph.json
+++ b/demo/records/subgraph/SushiswapV3Subgraph.json
@@ -5,5 +5,6 @@
   "name": "sushiswap-v3-subgraph",
   "repository": "https://github.com/sushiswap/subgraphs",
   "repository_ref": "d491b69adb9ff3666162ac284ab77a146f231794",
+  "repository_tag": "",
   "subgraph_dir": "subgraphs/v3"
 }
diff --git a/demo/records/subgraph/deployments/SushiswapBlocksSubgraphDeployment.json b/demo/records/subgraph/deployments/SushiswapBlocksSubgraphDeployment.json
index a6ff195..ad78a6b 100644
--- a/demo/records/subgraph/deployments/SushiswapBlocksSubgraphDeployment.json
+++ b/demo/records/subgraph/deployments/SushiswapBlocksSubgraphDeployment.json
@@ -4,7 +4,7 @@
   "schema": "",
   "request": "",
   "name": "sushiswap-blocks-subgraph",
-  "subgraphName": "sushiswap/blocks",
+  "subgraph_name": "sushiswap/blocks",
   "subgraph": "<subgraph-record-id>",
   "subgraph_id": "QmfBt5NbZdNhBoZS6MFj891YpNWQs8ysWkwVeEHF6rvscg",
   "network": "filecoin",
diff --git a/demo/records/subgraph/deployments/SushiswapRouteProcessorSubgraphDeployment.json b/demo/records/subgraph/deployments/SushiswapRouteProcessorSubgraphDeployment.json
index bd5a396..d35d16a 100644
--- a/demo/records/subgraph/deployments/SushiswapRouteProcessorSubgraphDeployment.json
+++ b/demo/records/subgraph/deployments/SushiswapRouteProcessorSubgraphDeployment.json
@@ -4,7 +4,7 @@
   "schema": "",
   "request": "",
   "name": "sushiswap-route-processor-subgraph",
-  "subgraphName": "sushiswap/rp4-filecoin",
+  "subgraph_name": "sushiswap/rp4-filecoin",
   "subgraph": "<subgraph-record-id>",
   "subgraph_id": "QmcHTxwH74YgaMJFXKrNqpVVdQQWAyhbxMh9xUtYjKa3fw",
   "network": "filecoin",
diff --git a/demo/records/subgraph/deployments/SushiswapSubgraphDeployment.json b/demo/records/subgraph/deployments/SushiswapSubgraphDeployment.json
index 9cb5a42..cd83669 100644
--- a/demo/records/subgraph/deployments/SushiswapSubgraphDeployment.json
+++ b/demo/records/subgraph/deployments/SushiswapSubgraphDeployment.json
@@ -4,7 +4,7 @@
   "schema": "",
   "request": "",
   "name": "sushiswap-subgraph",
-  "subgraphName": "sushiswap/sushiswap-filecoin",
+  "subgraph_name": "sushiswap/sushiswap-filecoin",
   "subgraph": "<subgraph-record-id>",
   "subgraph_id": "QmbZdkSH5NoS1aycafeqQZ7QJycokDVBXG2526g5KmuR1F",
   "network": "filecoin",
diff --git a/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json b/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json
index b632c9c..ab71419 100644
--- a/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json
+++ b/demo/records/subgraph/deployments/SushiswapV2SubgraphDeployment.json
@@ -4,7 +4,7 @@
   "schema": "",
   "request": "",
   "name": "sushiswap-v2-subgraph",
-  "subgraphName": "sushiswap/v2-filecoin",
+  "subgraph_name": "sushiswap/v2-filecoin",
   "subgraph": "<subgraph-record-id>",
   "subgraph_id": "QmejnkeYZxJKxz6kV62V6mSmAKVDuyoiDsempRC6NMunYo",
   "network": "filecoin",
diff --git a/demo/records/subgraph/deployments/SushiswapV3SubgraphDeployment.json b/demo/records/subgraph/deployments/SushiswapV3SubgraphDeployment.json
index fa3b1ee..dec8b61 100644
--- a/demo/records/subgraph/deployments/SushiswapV3SubgraphDeployment.json
+++ b/demo/records/subgraph/deployments/SushiswapV3SubgraphDeployment.json
@@ -4,7 +4,7 @@
   "schema": "",
   "request": "",
   "name": "sushiswap-v3-subgraph",
-  "subgraphName": "sushiswap/v3-filecoin",
+  "subgraph_name": "sushiswap/v3-filecoin",
   "subgraph": "<subgraph-record-id>",
   "subgraph_id": "QmRPQM4ZtRJYr8WiNdg6oqKRNQHHXv5rZrD4gzqQrJpPhz",
   "network": "filecoin",
diff --git a/demo/records/watcher/AjnaWatcher.json b/demo/records/watcher/AjnaWatcher.json
index 45df775..2433ebb 100644
--- a/demo/records/watcher/AjnaWatcher.json
+++ b/demo/records/watcher/AjnaWatcher.json
@@ -5,6 +5,6 @@
   "name": "ajna-watcher",
   "repository": "https://git.vdb.to/cerc-io/ajna-watcher-ts",
   "repository_ref": "66b8d96308eacab1ef6a4f3cb74a0f28fb18dc67",
-  "watcher_version": "0.1.3",
+  "repository_tag": "v0.1.3",
   "is_subgraph_watcher": true
 }
diff --git a/demo/records/watcher/AzimuthWatcher.json b/demo/records/watcher/AzimuthWatcher.json
index 3381dc9..c3075a2 100644
--- a/demo/records/watcher/AzimuthWatcher.json
+++ b/demo/records/watcher/AzimuthWatcher.json
@@ -5,6 +5,6 @@
   "name": "azimuth-watcher",
   "repository": "https://github.com/cerc-io/azimuth-watcher-ts",
   "repository_ref": "ffd8baa4bcdd0b0fff701d942de572b7ddf33191",
-  "watcher_version": "0.1.3",
+  "repository_tag": "v0.1.3",
   "is_subgraph_watcher": false
 }
diff --git a/demo/records/watcher/MerklSushiswapWatcher.json b/demo/records/watcher/MerklSushiswapWatcher.json
deleted file mode 100644
index 2efb169..0000000
--- a/demo/records/watcher/MerklSushiswapWatcher.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "type": "WatcherRecord",
-  "version": "0.1.0",
-  "schema": "",
-  "name": "merkl-sushiswap-v3-watcher",
-  "repository": "https://github.com/cerc-io/merkl-sushiswap-v3-watcher-ts",
-  "repository_ref": "b7cf79883e73400ad064b0357208c167795ab521",
-  "watcher_version": "0.1.9",
-  "is_subgraph_watcher": true
-}
diff --git a/demo/records/watcher/SushiswapWatcher.json b/demo/records/watcher/SushiswapWatcher.json
index c110a74..b036f73 100644
--- a/demo/records/watcher/SushiswapWatcher.json
+++ b/demo/records/watcher/SushiswapWatcher.json
@@ -5,6 +5,6 @@
   "name": "sushiswap-v3-watcher",
   "repository": "https://github.com/cerc-io/sushiswap-v3-watcher-ts",
   "repository_ref": "2f9f4d1ca191805922a51d1e3b471c06314fbc64",
-  "watcher_version": "0.1.9",
+  "repository_tag": "v0.1.9",
   "is_subgraph_watcher": true
 }
diff --git a/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json b/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json
deleted file mode 100644
index bd1a56f..0000000
--- a/demo/records/watcher/deployments/MerklSushiswapWatcherDeployment.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "type": "WatcherDeploymentRecord",
-  "version": "0.1.0",
-  "schema": "",
-  "request": "",
-  "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
-}