diff --git a/assemble_image.sh b/assemble_image.sh
index 3bb1d484b603928882da45b9a76f1a46f3b426d1..d0da89ed6d752668b83c5ff7705b00e92ac2ddec 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -8,7 +8,7 @@ WORKSPACE="workspace"
 REBUILD_CALAMARES=1
 
 # Helpers
-REGULAR_USER="${SUDO_USER:-${USER}}"
+REGULAR_USER="${SUDO_USER:-${DOAS_USER:-$USER}}"
 REGULAR_USER_HOME=$(getent passwd "$REGULAR_USER" | cut -d: -f6)
 ISO_PROFILES_REPO="$REGULAR_USER_HOME/iso-profiles"
 PROFILE="$ISO_PROFILES_REPO/osak/lip"
@@ -145,8 +145,8 @@ install_custom_calamares() {
     mkdir -p "$BUILD_DIR"
     cp "calamares/PKGBUILD" "$BUILD_DIR"
     cd "$BUILD_DIR"
-    chown lars:lars -R .
-    doas -u lars makepkg
+    chown "$REGULAR_USER:$REGULAR_USER" -R .
+    doas -u "$REGULAR_USER" makepkg
     cd -
     rsync -a "$BUILD_DIR"/ "$CACHE"
   fi
@@ -170,4 +170,6 @@ set -e
 
 mv /var/cache/manjaro-tools/iso/osak/lip/*/*.iso "$WORKSPACE"
 
+chown "$REGULAR_USER:$REGULAR_USER" -R "$WORKSPACE"
+
 # vim: tabstop=2 shiftwidth=2 expandtab