diff --git a/Makefile b/Makefile
index 3c03615..6bf5b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ deploy-caddy:
 BIN_SERVICE=whatbin.service
 GECKODRIVER_SERVICE=geckodriver.service
 services-setup:
+	make host-set-check
 	scp -r ./services/${BIN_SERVICE} ${USER}@${WHAT_BIN_HOST}:/lib/systemd/system/${BIN_SERVICE}
 	scp -r ./services/${GECKODRIVER_SERVICE} ${USER}@${WHAT_BIN_HOST}:/lib/systemd/system/${GECKODRIVER_SERVICE}
 	ssh ${USER}@${WHAT_BIN_HOST} "systemctl daemon-reload"
diff --git a/services/whatbin.service b/services/whatbin.service
index 630e36a..18ff9e0 100644
--- a/services/whatbin.service
+++ b/services/whatbin.service
@@ -6,6 +6,7 @@ After=network.target
 Type=simple
 EnvironmentFile=/root/what-bin-is-it/.env
 ExecStart=/root/what-bin-is-it/server
+WorkingDirectory=/root/what-bin-is-it/
 Restart=always
 RestartSec=5s