diff --git a/Makefile b/Makefile
index f95c861..5f78cc4 100644
--- a/Makefile
+++ b/Makefile
@@ -95,8 +95,8 @@ endif
 		${TTY_ARGS} \
 		${NETWORK_ARGS} \
 		--network none \
-		--mount type=bind,source="$(shell pwd)"/data,target=/data,readonly \
-		--mount type=bind,source="$(shell pwd)"/submission,target=/submission \
+		--mount type=bind,source="$(shell pwd)"/data,target=/code_execution/data,readonly \
+		--mount type=bind,source="$(shell pwd)"/submission,target=/code_execution/submission \
 		--shm-size 8g \
 		--name ${CONTAINER_NAME} \
 		--rm \
diff --git a/runtime/entrypoint.sh b/runtime/entrypoint.sh
index 761532a..3507e87 100644
--- a/runtime/entrypoint.sh
+++ b/runtime/entrypoint.sh
@@ -14,14 +14,17 @@ main () {
     fi
 
     echo Unpacking submission
-    unzip ./submission/submission.zip -d ./src
+    unzip ./submission/submission.zip -d ./workdir
 
     echo Printing submission contents
-    find src
+    find workdir
 
-    LOGURU_LEVEL=INFO sh main.sh
+    pushd workdir
+    sh main.sh
+    popd
 
-    pytest tests/test_submission
+    # test the submission
+    pytest tests/test_submission.py
 }
 
 main |& tee "/code_execution/submission/log.txt"
diff --git a/runtime/tests/test_submission.py b/runtime/tests/test_submission.py
index 162dfc0..20241c9 100644
--- a/runtime/tests/test_submission.py
+++ b/runtime/tests/test_submission.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-SUBMISSION_PATH = Path("/code_execution/submission/submission.csv")
+SUBMISSION_PATH = Path("/code_execution/workdir/submission.csv")
 CHECK_SUBMISSION = os.environ.get("CHECK_SUBMISSION", "false") == "true"