diff --git a/networks.json b/networks.json
index 1a165f3..7fb5973 100644
--- a/networks.json
+++ b/networks.json
@@ -1,12 +1,22 @@
 {
+  "arbitrum": {
+    "SubgraphAvailabilityManager": {
+      "address": "0x1cB555359319A94280aCf85372Ac2323AaE2f5fd",
+      "startBlock": 223974980
+    },
+    "SAODataEdge": {
+      "address": "0xeD16cEbd4fa74a0016E1149cc03563Db4B223aec",
+      "startBlock": 223927924
+    }
+  },
   "arbitrum-sepolia": {
     "SubgraphAvailabilityManager": {
-      "address": "0x9bDC3264596850E7F5d141A8D898dFA7001355CC",
-      "startBlock": 22552633
+      "address": "0x71D9aE967d1f31fbbD1817150902de78f8f2f73E",
+      "startBlock": 49584061
     },
     "SAODataEdge": {
       "address": "0xB61AF143c79Cbdd68f179B657AaC86665CC2B469",
-      "startBlock": 25463619
+      "startBlock": 49584061
     }
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 556fadd..d991f43 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,9 @@
     "create-local": "graph create --node http://localhost:8020/ network-monitoring-subgraph",
     "remove-local": "graph remove --node http://localhost:8020/ network-monitoring-subgraph",
     "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 network-monitoring-subgraph",
-    "test": "yarn && yarn prep:test && yarn codegen && graph test",
-    "prep:test": "mustache ./config/test.json subgraph.template.yaml > subgraph.yaml"
+    "test": "yarn && yarn codegen && graph test",
+    "deploy-arbitrum-sepolia": "yarn && yarn codegen && graph build --network arbitrum-sepolia && graph deploy --studio graph-monitoring-arb-sepolia",
+    "deploy-arbitrum": "yarn && yarn codegen && graph build --network arbitrum && graph deploy --studio graph-monitoring-arbitrum"
   },
   "dependencies": {
     "@graphprotocol/graph-cli": "0.71.0",
diff --git a/subgraph.template.yaml b/subgraph.yaml
similarity index 92%
rename from subgraph.template.yaml
rename to subgraph.yaml
index 48565da..53016c1 100644
--- a/subgraph.template.yaml
+++ b/subgraph.yaml
@@ -7,8 +7,8 @@ dataSources:
     network: arbitrum-sepolia
     source:
       abi: SubgraphAvailabilityManager
-      address: "0x9bDC3264596850E7F5d141A8D898dFA7001355CC"
-      startBlock: 22552633
+      address: "0x71D9aE967d1f31fbbD1817150902de78f8f2f73E"
+      startBlock: 49584061
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -34,7 +34,7 @@ dataSources:
     source:
       address: "0xB61AF143c79Cbdd68f179B657AaC86665CC2B469"
       abi: SAODataEdge
-      startBlock: 25463619
+      startBlock: 49584061
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7