diff --git a/Makefile b/Makefile
index f16539d..eca7ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -55,9 +55,9 @@ VOLUME_MOUNT ?= $(PWD)
 shell:
 	@: $${I}
 ifeq ($(I),admin)
-	docker run -it --rm --network host -v $(VOLUME_MOUNT):/src -v /var/run/docker.sock:/var/run/docker.sock -v $(HOME)/.aws:/var/riju/.aws:ro -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e VOLUME_MOUNT=$(VOLUME_MOUNT) riju:$(I)
+	docker run -it --rm --hostname $(I) -v $(VOLUME_MOUNT):/src -v /var/run/docker.sock:/var/run/docker.sock -v $(HOME)/.aws:/var/riju/.aws:ro -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e VOLUME_MOUNT=$(VOLUME_MOUNT) --network host riju:$(I)
 else
-	docker run -it --rm -v $(VOLUME_MOUNT):/src riju:$(I)
+	docker run -it --rm --hostname $(I) -v $(VOLUME_MOUNT):/src riju:$(I)
 endif
 
 .PHONY: install
diff --git a/docker/admin/pid1.bash b/docker/admin/pid1.bash
index 5e55091..0e8cb5f 100755
--- a/docker/admin/pid1.bash
+++ b/docker/admin/pid1.bash
@@ -2,11 +2,11 @@
 
 set -euo pipefail
 
-groupadd -g "$(stat -c %g "$PWD")" -o -p '!' -r riju-admin
-useradd -u "$(stat -c %u "$PWD")" -g "$(stat -c %g "$PWD")" -o -m -N -l -s /usr/bin/bash -G sudo riju-admin
+groupadd -g "$(stat -c %g "$PWD")" -o -p '!' -r riju
+useradd -u "$(stat -c %u "$PWD")" -g "$(stat -c %g "$PWD")" -o -m -N -l -s /usr/bin/bash -G sudo riju
 
-runuser -u riju-admin -- touch /home/riju-admin/.sudo_as_admin_successful
-runuser -u riju-admin -- ln -sT /var/riju/.aws /home/riju-admin/.aws
-runuser -u riju-admin -- yarn install
+runuser -u riju -- touch /home/riju/.sudo_as_admin_successful
+runuser -u riju -- ln -sT /var/riju/.aws /home/riju/.aws
+runuser -u riju -- yarn install
 
-exec runuser -u riju-admin "$@"
+exec runuser -u riju "$@"
diff --git a/docker/packaging/pid1.bash b/docker/packaging/pid1.bash
index d362bde..bc53342 100755
--- a/docker/packaging/pid1.bash
+++ b/docker/packaging/pid1.bash
@@ -2,9 +2,10 @@
 
 set -euo pipefail
 
-groupadd -g "$(stat -c %g "$PWD")" -o -p '!' -r riju-packager
-useradd -u "$(stat -c %u "$PWD")" -g "$(stat -c %g "$PWD")" -o -m -N -l -s /usr/bin/bash -G sudo riju-packager
+groupadd -g "$(stat -c %g "$PWD")" -o -p '!' -r riju
+useradd -u "$(stat -c %u "$PWD")" -g "$(stat -c %g "$PWD")" -o -m -N -l -s /usr/bin/bash -G sudo riju
 
-runuser -u riju-packager touch /home/riju-packager/.sudo_as_admin_successful
+runuser -u riju touch /home/riju/.sudo_as_admin_successful
+runuser -u riju -- yarn install
 
-exec runuser -u riju-packager "$@"
+exec runuser -u riju "$@"
diff --git a/docker/runtime/pid1.bash b/docker/runtime/pid1.bash
index 0689f59..bc53342 100755
--- a/docker/runtime/pid1.bash
+++ b/docker/runtime/pid1.bash
@@ -6,5 +6,6 @@ groupadd -g "$(stat -c %g "$PWD")" -o -p '!' -r riju
 useradd -u "$(stat -c %u "$PWD")" -g "$(stat -c %g "$PWD")" -o -m -N -l -s /usr/bin/bash -G sudo riju
 
 runuser -u riju touch /home/riju/.sudo_as_admin_successful
+runuser -u riju -- yarn install
 
 exec runuser -u riju "$@"