diff --git a/Dockerfile b/Dockerfile
index 3337426..864ac90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,20 +2,18 @@ FROM node:18-slim
 
 ARG AGRSGROUP=1004
 
+RUN apt-get update && apt-get install -y gosu
+
 RUN groupadd --force -g $AGRSGROUP assistest
 RUN useradd -ms /bin/bash --no-user-group -g $AGRSGROUP -u 1337 assistest
 
+RUN mkdir /home/assistest/app && chown -R assistest:assistest /home/assistest/app
 RUN mkdir /home/assistest/student-app && chown -R assistest:assistest /home/assistest/student-app
 RUN mkdir /home/assistest/report && chown -R assistest:assistest /home/assistest/report
 
-VOLUME ["/home/assistest/student-app"]
-
 WORKDIR /home/assistest/app
-RUN chown -R assistest:assistest /home/assistest/app
-
-USER assistest
-
 COPY --chown=assistest:assistest . .
+
 RUN npm config set package-lock false
 RUN yarn install --production=true
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 43b2910..d7d4aec 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
-rm -f /reports/report.json || true
-"$@"
\ No newline at end of file
+rm -f /home/assistest/reports/report.json || true
+chown -R assistest:assistest /home/assistest/student-app
+exec gosu assistest "$@"