diff --git a/packer/ansible/roles/fablab/templates/metalcut/metalcut.sh.j2 b/packer/ansible/roles/fablab/templates/metalcut/metalcut.sh.j2
index bbee996..97bea9f 100755
--- a/packer/ansible/roles/fablab/templates/metalcut/metalcut.sh.j2
+++ b/packer/ansible/roles/fablab/templates/metalcut/metalcut.sh.j2
@@ -4,7 +4,7 @@ remote='{{ fablab.metalcut.socket }}'
 image='{{ fablab.metalcut.dockerimage }}'
 
 if [ ! -z "$SUDO_COMMAND" ] && [ "$SUDO_COMMAND" = "$0" ]; then
-	home="$(getent passwd "$SUDO_USER" | cut -d: -f6)"
+	home="$(getent passwd "$SUDO_UID" | cut -d: -f6)"
 	uid="$SUDO_UID"
 	gid="$SUDO_GID"
 else
@@ -19,6 +19,7 @@ docker run \
 	-e DISPLAY \
 	-e uid="$uid" \
 	-e gid="$gid" \
-	-v "$HOME:$home" \
+	-v "$home:/home/metalcut/work" \
+	-v '/media:/media' \
 	-e remote="$remote" \
 	$image