diff --git a/Dockerfile b/Dockerfile
index f7d9214197b38b285ee3ae85c9d8030a7513fbf4..cd14acf935853d62c1f53fa9f23e9952107f8ded 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM osrf/ros:melodic-desktop-full-bionic
 
-ENV uid 1000
-ENV gid 1000
+ARG uid=1000
+ARG gid=1000
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/README.md b/README.md
index 289ee8b6a2f6a5a0ef08b4b19cdcec6051f8fbad..17a7ae6d1a0182005cdf01fffa65091f5c573a53 100644
--- a/README.md
+++ b/README.md
@@ -48,11 +48,7 @@ See the [README.md of the submodule](../../../../sample_applications/-/blob/mast
 
 To run via docker on any up-to-date linux system:
 
-- **Either** clone this repo and its submodules (recommended for fresh installations):
+- Clone this repo and its submodules (recommended for fresh installations):
     - as a guest: `git clone --recurse-submodules https://git-st.inf.tu-dresden.de/ceti/ros/panda_gazebo_workspace.git panda_gazebo_workspace`
     - as a project member with a registered ssh key: `git clone --recurse-submodules git@git-st.inf.tu-dresden.de:ceti/ros/panda_gazebo_workspace.git panda_gazebo_workspace`
-- `docker build . -t ceti-panda-gazebo-workspace`
-- `./docker-run.sh roslaunch sample_applications sample_simple_simulation.launch`
-
-Note that this expects your `uid` and `gid` to be `1000`. This is generally the case if your user is the primary user on your system. Otherwise, please change
-the values at the top of the `Dockerfile`.
\ No newline at end of file
+- Run `./docker-run.sh roslaunch sample_applications sample_simple_simulation.launch` to build and run a docker image tagged with `ceti-panda-gazebo-workspace`
\ No newline at end of file
diff --git a/docker-run.sh b/docker-run.sh
index 8fbb638b940b97eb4dd114f4c0f78145593a0be2..dfc54c786f6b14abc11df48b3800743768c7fdbd 100755
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -2,6 +2,10 @@
 
 # http://wiki.ros.org/docker/Tutorials/GUI
 
+docker build . -t ceti-panda-gazebo-workspace \
+    --build-arg UID=$UID \
+    --build-arg GID=$GID
+
 XSOCK=/tmp/.X11-unix
 XAUTH=/tmp/.docker.xauth
 touch $XAUTH