diff --git a/content/docker_uid.rst b/content/docker_uid.rst
index ab8e7899c376435fc462d0178234a9884b2bd712..36dea6d9b3dbe453d083404f076e874fda8feb5e 100644
--- a/content/docker_uid.rst
+++ b/content/docker_uid.rst
@@ -42,7 +42,7 @@ commands.
     uid="$(stat . --format '%u')"
     gid="$(stat . --format '%g')"
     groupadd --force --non-unique --gid "$gid" builder
-    useradd --non-unique --uid "$uid" --gid "$gid" --home-dir /volume --no-create-home --shell /bin/bash builder
+    useradd --non-unique --uid "$uid" --gid "$gid" --home-dir "$PWD" --no-create-home --shell /bin/bash builder
     sudo -Eu "#$uid" -g "#$gid" -- "$@"
 
 The script is also available for `download
@@ -55,9 +55,9 @@ into your Dockerfile, or download it via the :code:`ADD` directive, like so:
 .. code:: shell
 
     FROM debian:stable
-    RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    RUN apt-get update && \
         DEBIAN_FRONTEND=noninteractive apt-get install -y sudo build-essential
-    ADD [ "https://www.shore.co.il/blog/static/runas-gnu", "/entrypoint"]
+    ADD [ "https://www.shore.co.il/blog/static/runas-gnu", "/entrypoint" ]
     ENTRYPOINT [ "/bin/sh", "/entrypoint" ]
     VOLUME /volume
     WORKDIR /volume
diff --git a/content/static/runas-busybox b/content/static/runas-busybox
index 01b3f7deecd523e16ce972cf3c38e4a322c60b49..74f92d3042594ea0aae69259cfa7811c5c1e1009 100755
--- a/content/static/runas-busybox
+++ b/content/static/runas-busybox
@@ -4,5 +4,5 @@ command -v sudo > /dev/null || { echo "Can't find sudo, exiting."; exit 1; }
 uid="$(stat . -c '%u')"
 gid="$(stat . -c '%g')"
 addgroup -g "$gid" builder
-adduser -h /volume -s /bin/sh -G builder -u "$uid" -H -D builder
+adduser -h "$PWD" -s /bin/sh -G builder -u "$uid" -H -D builder
 sudo -Eu "#$uid" -g "#$gid" -- "$@"
diff --git a/content/static/runas-gnu b/content/static/runas-gnu
index a78926aef24fcf07f355a3a6eb5cbcd065f9e6ac..d3dd2f777281e3869f38cb05b753ddfe181b5f5d 100755
--- a/content/static/runas-gnu
+++ b/content/static/runas-gnu
@@ -4,5 +4,5 @@ command -v sudo > /dev/null || { echo "Can't find sudo, exiting."; exit 1; }
 uid="$(stat . --format '%u')"
 gid="$(stat . --format '%g')"
 groupadd --force --non-unique --gid "$gid" builder
-useradd --non-unique --uid "$uid" --gid "$gid" --home-dir /volume --no-create-home --shell /bin/bash builder
+useradd --non-unique --uid "$uid" --gid "$gid" --home-dir "$PWD" --no-create-home --shell /bin/bash builder
 sudo -Eu "#$uid" -g "#$gid" -- "$@"