diff --git a/Dockerfile b/Dockerfile
index 0997621..219bd56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,22 @@ RUN dpkg -i google-chrome*.deb
 RUN wget https://chromedriver.storage.googleapis.com/2.42/chromedriver_linux64.zip && unzip chromedriver_linux64.zip
 RUN cp chromedriver /usr/local/bin && chmod +x /usr/local/bin/chromedriver
 
+# Create build user
+RUN useradd -m -s /bin/bash tester && adduser tester sudo && echo "tester:tester" | chpasswd
+
+WORKDIR /home/tester
+
+COPY scripts/run_suite.sh /home/tester
+
+# Create /home/tester/suites as a mount point for sharing files with the host system.
+RUN mkdir suites
+
+# Make sure everything in /home/tester is owned by the build user
+RUN chown -R tester:tester .
+
+USER tester
+
 # RUN apt-get install -y udev
 
-CMD ["/scripts/run_suite.sh"]
+CMD ["/home/tester/run_suite.sh"]
 
diff --git a/output/.keep b/output/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/reports/.keep b/reports/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/run_tests.sh b/run_tests.sh
index 95a4b4b..2901ee9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -3,10 +3,7 @@
 docker run --rm \
            -e USERNAME="Ipatios Asmanidis" \
            --net=host \
-           -v "$PWD/output":/output \
-           -v "$PWD/suites":/suites \
-           -v "$PWD/scripts":/scripts \
-           -v "$PWD/reports":/reports \
+           -v "$PWD/suites":/home/tester/suites \
            --security-opt seccomp:unconfined \
            --shm-size "256M" \
            ypasmk/robot-framework
\ No newline at end of file
diff --git a/scripts/run_suite.sh b/scripts/run_suite.sh
index 777c0b7..144ade2 100755
--- a/scripts/run_suite.sh
+++ b/scripts/run_suite.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-CMD="robot --console verbose --outputdir /reports /suites"
+CMD="robot --console verbose --outputdir /home/tester/suites/reports /home/tester/suites"
 
 echo ${CMD}