diff --git a/crawlers/deploy/arbitrum-one-state.service b/crawlers/deploy/arbitrum-one-state.service
index da19d38c..78155110 100644
--- a/crawlers/deploy/arbitrum-one-state.service
+++ b/crawlers/deploy/arbitrum-one-state.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Execute Game7 state crawler
+Description=Execute Arbitrum one state crawler
 After=network.target
 
 [Service]
 Type=oneshot
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain game7
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain arbitrum_one
 CPUWeight=60
-SyslogIdentifier=game7-state
\ No newline at end of file
+SyslogIdentifier=arbitrum-one-state
\ No newline at end of file
diff --git a/crawlers/deploy/arbitrum-one-state.timer b/crawlers/deploy/arbitrum-one-state.timer
index f1a7e2dc..956b741a 100644
--- a/crawlers/deploy/arbitrum-one-state.timer
+++ b/crawlers/deploy/arbitrum-one-state.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Execute Game7 state crawler each 5m
+Description=Execute Arbitrum one state crawler each 5m
 
 [Timer]
 OnBootSec=15s
diff --git a/crawlers/deploy/arbitrum-sepolia-state.service b/crawlers/deploy/arbitrum-sepolia-state.service
index da19d38c..d6a96a1d 100644
--- a/crawlers/deploy/arbitrum-sepolia-state.service
+++ b/crawlers/deploy/arbitrum-sepolia-state.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Execute Game7 state crawler
+Description=Execute Arbitrum Sepolia state crawler
 After=network.target
 
 [Service]
 Type=oneshot
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain game7
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain arbitrum_sepolia
 CPUWeight=60
-SyslogIdentifier=game7-state
\ No newline at end of file
+SyslogIdentifier=arbitrum-sepolia-state
\ No newline at end of file
diff --git a/crawlers/deploy/arbitrum-sepolia-state.timer b/crawlers/deploy/arbitrum-sepolia-state.timer
index f1a7e2dc..5ce33711 100644
--- a/crawlers/deploy/arbitrum-sepolia-state.timer
+++ b/crawlers/deploy/arbitrum-sepolia-state.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Execute Game7 state crawler each 5m
+Description=Execute Arbitrum Sepolia state crawler each 5m
 
 [Timer]
 OnBootSec=15s
diff --git a/crawlers/deploy/ethereum-state.timer b/crawlers/deploy/ethereum-state.timer
index 7db2aa54..9dec56d4 100644
--- a/crawlers/deploy/ethereum-state.timer
+++ b/crawlers/deploy/ethereum-state.timer
@@ -1,9 +1,9 @@
 [Unit]
-Description=Execute Ethereum state crawler each 10m
+Description=Execute Ethereum state crawler each 5m
 
 [Timer]
 OnBootSec=15s
-OnUnitActiveSec=10m
+OnUnitActiveSec=5m
 
 [Install]
 WantedBy=timers.target
diff --git a/crawlers/deploy/game7-testnet-state.service b/crawlers/deploy/game7-testnet-state.service
index da19d38c..98855fa3 100644
--- a/crawlers/deploy/game7-testnet-state.service
+++ b/crawlers/deploy/game7-testnet-state.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Execute Game7 state crawler
+Description=Execute Game7 testnet state crawler
 After=network.target
 
 [Service]
 Type=oneshot
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain game7
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain game7_testnet
 CPUWeight=60
-SyslogIdentifier=game7-state
\ No newline at end of file
+SyslogIdentifier=game7-testnet-state
\ No newline at end of file
diff --git a/crawlers/deploy/game7-testnet-state.timer b/crawlers/deploy/game7-testnet-state.timer
index f1a7e2dc..9324115e 100644
--- a/crawlers/deploy/game7-testnet-state.timer
+++ b/crawlers/deploy/game7-testnet-state.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Execute Game7 state crawler each 5m
+Description=Execute Game7 testnet state crawler each 5m
 
 [Timer]
 OnBootSec=15s
diff --git a/crawlers/deploy/sepolia-metadata.service b/crawlers/deploy/sepolia-metadata.service
deleted file mode 100644
index 96478ec3..00000000
--- a/crawlers/deploy/sepolia-metadata.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Execute metadata crawler
-After=network.target
-
-[Service]
-Type=oneshot
-WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
-EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.metadata_crawler.cli crawl --blockchain game7
-CPUWeight=60
-SyslogIdentifier=game7-metadata
diff --git a/crawlers/deploy/sepolia-state.service b/crawlers/deploy/sepolia-state.service
new file mode 100644
index 00000000..fb2b426c
--- /dev/null
+++ b/crawlers/deploy/sepolia-state.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Execute Sepolia state crawler
+After=network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain sepolia
+CPUWeight=60
+SyslogIdentifier=sepolia-state
\ No newline at end of file
diff --git a/crawlers/deploy/sepolia-state.timer b/crawlers/deploy/sepolia-state.timer
index f1a7e2dc..210368d3 100644
--- a/crawlers/deploy/sepolia-state.timer
+++ b/crawlers/deploy/sepolia-state.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Execute Game7 state crawler each 5m
+Description=Execute Sepolia state crawler each 5m
 
 [Timer]
 OnBootSec=15s