diff --git a/nodes/deploy/ethereum/node-status.service b/nodes/deploy/ethereum/node-status.service
index 202b48b2..a74b27df 100644
--- a/nodes/deploy/ethereum/node-status.service
+++ b/nodes/deploy/ethereum/node-status.service
@@ -7,7 +7,10 @@ User=ubuntu
 Group=www-data
 WorkingDirectory=/home/ubuntu/moonstream/nodes/server
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream/nodes/server/nodestatus -blockchain ethereum -host "${AWS_LOCAL_IPV4}" -port 8734
+ExecStart=/home/ubuntu/moonstream/nodes/server/nodestatus \
+    -blockchain polygon \
+    -host "${AWS_LOCAL_IPV4}" \
+    -port "${MOONSTREAM_NODES_SERVER_PORT}"
 SyslogIdentifier=node-status
 
 [Install]
diff --git a/nodes/deploy/polygon/deploy.bash b/nodes/deploy/polygon/deploy.bash
index 0d073b24..ff0d6ab0 100755
--- a/nodes/deploy/polygon/deploy.bash
+++ b/nodes/deploy/polygon/deploy.bash
@@ -26,15 +26,6 @@ HEIMDALL_HOME="/mnt/disks/nodes/${BLOCKCHAIN}/.heimdalld"
 # Node status server service file
 NODE_STATUS_SERVER_SERVICE_FILE="node-status.service"
 
-
-# Polygon heimdalld service files
-POLYGON_HEIMDALLD_SERVICE_FILE="heimdalld.service"
-POLYGON_HEIMDALLD_BRIDGE_SERVICE_FILE="heimdalld-bridge.service"
-POLYGON_HEIMDALLD_REST_SERVICE_FILE="heimdalld-rest-server.service"
-
-# Polygon bor service file
-POLYGON_BOR_SERVICE_FILE="bor.service"
-
 set -eu
 
 echo
diff --git a/nodes/deploy/polygon/node-status.service b/nodes/deploy/polygon/node-status.service
index 8a12e666..a74b27df 100644
--- a/nodes/deploy/polygon/node-status.service
+++ b/nodes/deploy/polygon/node-status.service
@@ -7,7 +7,10 @@ User=ubuntu
 Group=www-data
 WorkingDirectory=/home/ubuntu/moonstream/nodes/server
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream/nodes/server/nodestatus -blockchain polygon -host "${AWS_LOCAL_IPV4}" -port 8734
+ExecStart=/home/ubuntu/moonstream/nodes/server/nodestatus \
+    -blockchain polygon \
+    -host "${AWS_LOCAL_IPV4}" \
+    -port "${MOONSTREAM_NODES_SERVER_PORT}"
 SyslogIdentifier=node-status
 
 [Install]