diff --git a/bin/omarchy-iso-make b/bin/omarchy-iso-make
index 98694e0..03fbdfb 100755
--- a/bin/omarchy-iso-make
+++ b/bin/omarchy-iso-make
@@ -40,6 +40,8 @@ DOCKER_ARGS=(
   --privileged
   -e "OMARCHY_INSTALLER_REPO=$OMARCHY_INSTALLER_REPO"
   -e "OMARCHY_INSTALLER_REF=$OMARCHY_INSTALLER_REF"
+  -e "HOST_UID=$(id -u)"
+  -e "HOST_GID=$(id -g)"
   -v "$BUILD_RELEASE_PATH/:/out/"
   -v "$BUILD_ROOT/$BUILD_SCRIPT:/$BUILD_SCRIPT:ro"
   -v "$BUILD_ROOT/archiso:/archiso:ro"
diff --git a/builder/build-iso.sh b/builder/build-iso.sh
index 05ad677..6306812 100755
--- a/builder/build-iso.sh
+++ b/builder/build-iso.sh
@@ -63,3 +63,8 @@ cp $build_cache_dir/pacman.conf "$build_cache_dir/airootfs/etc/pacman.conf"
 
 # Finally, we assemble the entire ISO
 mkarchiso -v -w "$build_cache_dir/work/" -o "/out/" "$build_cache_dir/"
+
+# Fix ownership of output files to match host user
+if [ -n "$HOST_UID" ] && [ -n "$HOST_GID" ]; then
+    chown -R "$HOST_UID:$HOST_GID" /out/
+fi