diff --git a/deploy.py b/deploy.py
index ef5dc71..b5d59ac 100644
--- a/deploy.py
+++ b/deploy.py
@@ -40,7 +40,7 @@ def handle_request(rq: DeployerRequest):
     deployment_id = str(int(time()))
 
     domain_dir = f"{DEPLOYERDIR}/{domain}"
-    logs_dir = f"{domain_dir}/{deployment_id}"
+    logs_dir = f"{domain_dir}/logs/{deployment_id}"
     os.makedirs(logs_dir, exist_ok=True)
 
     build_log = f"{logs_dir}/build.log"
diff --git a/deploy.sh b/deploy.sh
index fedf716..344abdc 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -10,7 +10,8 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart='PORT=$PORT make start'
+Environment="PORT=$PORT"
+ExecStart=make start
 User=drm
 WorkingDirectory=$DOMAIN_DIR/src
 Restart=on-failure
@@ -30,7 +31,7 @@ status:
 logs:
     journalctl -u deployer-$DOMAIN
 
-stop
+stop:
     systemctl stop deployer-$DOMAIN
 
 " > Makefile
diff --git a/deploy_self.py b/deploy_self.py
index 06a3971..ea413a4 100644
--- a/deploy_self.py
+++ b/deploy_self.py
@@ -5,6 +5,6 @@ handle_request(
         user="drm",
         repo="deployer",
         branch="main",
-        commit_hash="93954f3190f7bbcbf29df2f68ebc400acb47cda9",
+        commit_hash="5d71c964b77ba2b658dfa96169096fef13c64aeb",
     )
 )