diff --git a/crawlers/deploy/deploy-moonworm-cu.bash b/crawlers/deploy/deploy-moonworm-cu.bash
index 9f3c7718..fcd1f9bf 100755
--- a/crawlers/deploy/deploy-moonworm-cu.bash
+++ b/crawlers/deploy/deploy-moonworm-cu.bash
@@ -23,7 +23,7 @@ set -eu
 
 if [ ! -d "$PYTHON_ENV_DIR" ]; then
   echo -e "${PREFIX_WARN} Dierectory with Python environment doesn't exist, generating..."
-  sudo -u ubuntu python3.8 -m venv "${PYTHON_ENV_DIR}"
+  python3.9 -m venv "${PYTHON_ENV_DIR}"
 fi
 
 echo
@@ -40,6 +40,6 @@ echo
 echo
 echo -e "${PREFIX_INFO} Replacing existing Moonworm watch Unicorns service definition with ${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}"
 chmod 644 "${SCRIPT_DIR}/${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}" "/etc/systemd/system/${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}"
-systemctl daemon-reload
-systemctl restart "${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MOONWORM_WATCH_UNICORNS_MAINNET_SERVICE_FILE}"
diff --git a/crawlers/deploy/moonworm-unicorns-mainnet.service b/crawlers/deploy/moonworm-unicorns-mainnet.service
index e1190283..67448c67 100644
--- a/crawlers/deploy/moonworm-unicorns-mainnet.service
+++ b/crawlers/deploy/moonworm-unicorns-mainnet.service
@@ -1,13 +1,14 @@
-Description=Moonworm CryptoUnicorns watch
-After=network.target
+[Unit]
+Description=Moonworm CryptoUnicorns watch custom systemd service
 StartLimitIntervalSec=300
 StartLimitBurst=3
+After=network.target
 
 [Service]
-WorkingDirectory=/home/ubuntu
-EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
 Restart=on-failure
 RestartSec=15s
+WorkingDirectory=/home/ubuntu
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
 ExecStart=/home/ubuntu/moonworm-env/bin/python -m moonworm.cli watch-cu -w "${MOONSTREAM_POLYGON_WEB3_PROVIDER_URI}?access_id=${NB_CONTROLLER_ACCESS_ID}&data_source=blockchain" -c 0xdC0479CC5BbA033B3e7De9F178607150B3AbCe1f -d 21418707 --confirmations 60
 CPUWeight=70
 SyslogIdentifier=moonworm-unicorns-mainnet