diff --git a/Dockerfile b/Dockerfile
index 8ca861c6..b37627ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -187,5 +187,5 @@ RUN /var/swarms/agent_workspace/.venv/bin/python -m pip install -e /opt/swarms/
 #COPY requirements.txt .
 # things that change
 COPY api/main.py /opt/swarms/api/main.py
-WORKDIR /opt/swarms/api/
+WORKDIR /var/swarms/agent_workspace
 CMD ["/usr/bin/unbuffer", "/var/swarms/agent_workspace/.venv/bin/uvicorn", "--proxy-headers", "--forwarded-allow-ips='*'", "--workers=4", "--port=8000",    "--reload-delay=30",  "main:create_app"]
diff --git a/api/systemd/swarms-docker.service b/api/systemd/swarms-docker.service
index f1d044c6..1d50a1fa 100644
--- a/api/systemd/swarms-docker.service
+++ b/api/systemd/swarms-docker.service
@@ -14,7 +14,7 @@ ExecStartPre=-/usr/bin/docker stop %n
 ExecStartPre=-/usr/bin/docker rm %n
 ExecStartPre=/usr/bin/docker pull h4ckermike/swarms-api:experimental
 #ExecStart=/usr/bin/docker run --rm --name %n h4ckermike/swarms-api:experimental
-ExecStart=/usr/bin/docker run -e WORKSPACE_DIR=/var/swarms/agent_workspace/ --rm --name %n --network host h4ckermike/swarms-api:experimental 
+ExecStart=/usr/bin/docker run -w /var/swarms/agent_workspace -e WORKSPACE_DIR=/var/swarms/agent_workspace/ --rm --name %n --network host h4ckermike/swarms-api:experimental 
 StandardOutput=file:/var/log/swarms_systemd.log
 StandardError=file:/var/log/swarms_systemd.log
 ExecReload=/bin/kill -HUP ${MAINPID}