diff --git a/Dockerfile b/Dockerfile
index a629016..7690e80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 
 # Set Python path to include src directory
-ENV PYTHONPATH="/app/src:${PYTHONPATH}"
+ENV PYTHONPATH=/app/src
 
 # Install the package in editable mode
 RUN pip install -e .
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index bb0ffdd..40fa669 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -14,7 +14,7 @@ trap handle_term SIGTERM SIGINT
 
 # Start the application
 echo "Starting SimpleGuardHome server..."
-PYTHONPATH=/app/src python -m simpleguardhome.main &
+cd /app && PYTHONPATH=/app/src python3 -m simpleguardhome.main &
 
 # Store child PID
 child=$!