diff --git a/build-docker.sh b/build-docker.sh
index b3995d5..413c12a 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -126,8 +126,9 @@ else
 	wait "$!"
 fi
 
+# Ensure that deploy/ is always owned by calling user
 echo "copying results from deploy/"
-${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy .
+${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy - | tar -xf -
 ls -lah deploy
 
 # cleanup