diff --git a/nodes/deploy/ethereum/deploy.bash b/nodes/deploy/ethereum/deploy.bash
index 7e3f44e6..bcfb14a7 100755
--- a/nodes/deploy/ethereum/deploy.bash
+++ b/nodes/deploy/ethereum/deploy.bash
@@ -26,7 +26,7 @@ BLOCKCHAIN="ethereum"
 CHECKENV_PARAMETERS_SCRIPT="${SCRIPT_DIR}/parameters.bash"
 CHECKENV_NODES_CONNECTIONS_SCRIPT="${SCRIPT_DIR}/nodes-connections.bash"
 
-# Crawlers server service file
+# Nodes server service file
 NODES_SERVER_SERVICE_FILE="moonstreamnodes.service"
 
 # Ethereum geth service file
diff --git a/nodes/deploy/polygon/deploy.bash b/nodes/deploy/polygon/deploy.bash
index d08f90c6..742e35ea 100755
--- a/nodes/deploy/polygon/deploy.bash
+++ b/nodes/deploy/polygon/deploy.bash
@@ -15,6 +15,8 @@ PREFIX_CRIT="${C_RED}[CRIT]${C_RESET} [$(date +%d-%m\ %T)]"
 
 # Main
 AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION:-us-east-1}"
+APP_DIR="${APP_DIR:-/home/ubuntu/moonstream}"
+APP_NODES_DIR="${APP_DIR}/nodes"
 SECRETS_DIR="${SECRETS_DIR:-/home/ubuntu/moonstream-secrets}"
 PARAMETERS_ENV_PATH="${SECRETS_DIR}/app.env"
 SCRIPT_DIR="$(realpath $(dirname $0))"
@@ -25,6 +27,9 @@ HEIMDALL_HOME="/mnt/disks/nodes/${BLOCKCHAIN}/.heimdalld"
 CHECKENV_PARAMETERS_SCRIPT="${SCRIPT_DIR}/parameters.bash"
 CHECKENV_NODES_CONNECTIONS_SCRIPT="${SCRIPT_DIR}/nodes-connections.bash"
 
+# Nodes server service file
+NODES_SERVER_SERVICE_FILE="moonstreamnodes.service"
+
 # Polygon heimdalld service files
 POLYGON_HEIMDALLD_SERVICE_FILE="heimdalld.service"
 POLYGON_HEIMDALLD_BRIDGE_SERVICE_FILE="heimdalld-bridge.service"
@@ -35,6 +40,14 @@ POLYGON_BOR_SERVICE_FILE="bor.service"
 
 set -eu
 
+echo
+echo
+echo -e "${PREFIX_INFO} Building executable server of moonstreamnodes with Go"
+EXEC_DIR=$(pwd)
+cd "${APP_NODES_DIR}/server"
+HOME=/root /usr/local/go/bin/go build -o "${APP_NODES_DIR}/server/moonstreamnodes" "${APP_NODES_DIR}/server/main.go"
+cd "${EXEC_DIR}"
+
 echo
 echo
 echo -e "${PREFIX_INFO} Retrieving deployment parameters"
@@ -53,6 +66,15 @@ echo -e "${PREFIX_INFO} Replacing current node IP environment variable with loca
 LOCAL_IP="$(ec2metadata --local-ipv4)"
 sed -i "s|MOONSTREAM_NODE_POLYGON_IPC_ADDR=.*|MOONSTREAM_NODE_POLYGON_IPC_ADDR=\"$LOCAL_IP\"|" "${PARAMETERS_ENV_PATH}"
 
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing moonstreamnodes service definition with ${NODES_SERVER_SERVICE_FILE}"
+chmod 644 "${SCRIPT_DIR}/${NODES_SERVER_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${NODES_SERVER_SERVICE_FILE}" "/etc/systemd/system/${NODES_SERVER_SERVICE_FILE}"
+systemctl daemon-reload
+systemctl restart "${NODES_SERVER_SERVICE_FILE}"
+systemctl status "${NODES_SERVER_SERVICE_FILE}"
+
 echo
 echo
 echo -e "${PREFIX_INFO} Source extracted parameters"