diff --git a/.dockerignore b/.dockerignore
index f4681beed55791aef416dc5921b4556166466c07..72e8ffc0db8aad71a934dd11e5968bd5109e54b4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,9 +1 @@
-.git/
-.gitignore
-.dockerignore
-*.md
-*.dot
-*.pdf
-example/
-*.swp
-Dockerfile
+*
diff --git a/Dockerfile b/Dockerfile
index c57579bba6f4ef4a756da0cbf7061f5dd5075202..206eea34e654ae354af7a64dba5977931fd5c3da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
         texlive-luatex \
         texlive-publishers && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-VOLUME /project
-WORKDIR /project
-COPY entrypoint /entrypoint
-ENTRYPOINT ["/entrypoint"]
-CMD ["on-change", ".", "make"]
+ADD [ "https://www.shore.co.il/blog/static/runas", "/entrypoint" ]
+ENTRYPOINT [ "/bin/sh", "/entrypoint" ]
+VOLUME /volume
+WORKDIR /volume
+ENV HOME /volume
+CMD [ "on-change", ".", "make" ]
diff --git a/README.md b/README.md
index 314e6758af19890303718e1a09703c6220a81ceb..26c6b5c155c6cb47b06db5595e624f91b0e03ec4 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Markdown or DOT).
 `docker run -itv "$PWD:/project" adarnimrod/presentation`
 
 Will watch the current directory and run `make` whenever a file changes. One can
-add a shell alias `alias presentation='docker run -itv "$PWD:/project"
+add a shell alias `alias presentation='docker run -itv "$PWD:/volume"
 adarnimrod/presentation'` for easier use.
 
 See the example folder for more details.
diff --git a/entrypoint b/entrypoint
deleted file mode 100755
index 167520ccbe93ec7a72a6f957e0f3f51d58f12022..0000000000000000000000000000000000000000
--- a/entrypoint
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -eu
-uid="$(stat . --format '%u')"
-gid="$(stat . --format '%g')"
-sudo -Eu "#$uid" -g "#$gid" -- "$@"
diff --git a/example/README.md b/example/README.md
index 405b8c79f43e0e7e2fe3e07f7c7c00acf3bf0107..d12edadccaafe756135374f9aea29775fc105fd8 100644
--- a/example/README.md
+++ b/example/README.md
@@ -7,8 +7,8 @@ An example presentation written in Markdown and DOT.
 To watch the current directory and build the presentation whenever a change
 occurs
 
-`docker run -tv "$PWD:/project" adarnimrod/presentation`
+`docker run -tv "$PWD:/volume" adarnimrod/presentation`
 
 To build the presentation and exit
 
-`docker run -tv "$PWD:/project" adarnimrod/presentation make`
+`docker run -tv "$PWD:/volume" adarnimrod/presentation make`