diff --git a/export-image/01-user-rename/00-packages b/export-image/01-user-rename/00-packages
new file mode 100644
index 0000000..e8b69fc
--- /dev/null
+++ b/export-image/01-user-rename/00-packages
@@ -0,0 +1 @@
+userconf-pi
diff --git a/export-image/01-user-rename/01-run.sh b/export-image/01-user-rename/01-run.sh
new file mode 100755
index 0000000..8a5617b
--- /dev/null
+++ b/export-image/01-user-rename/01-run.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+	SUDO_USER="${FIRST_USER_NAME}" rename-user -f -s
+EOF
diff --git a/export-image/01-set-sources/01-run.sh b/export-image/02-set-sources/01-run.sh
similarity index 100%
rename from export-image/01-set-sources/01-run.sh
rename to export-image/02-set-sources/01-run.sh
diff --git a/export-image/02-network/01-run.sh b/export-image/03-network/01-run.sh
similarity index 100%
rename from export-image/02-network/01-run.sh
rename to export-image/03-network/01-run.sh
diff --git a/export-image/02-network/files/resolv.conf b/export-image/03-network/files/resolv.conf
similarity index 100%
rename from export-image/02-network/files/resolv.conf
rename to export-image/03-network/files/resolv.conf
diff --git a/export-image/03-set-partuuid/00-run.sh b/export-image/04-set-partuuid/00-run.sh
similarity index 100%
rename from export-image/03-set-partuuid/00-run.sh
rename to export-image/04-set-partuuid/00-run.sh
diff --git a/export-image/04-finalise/01-run.sh b/export-image/05-finalise/01-run.sh
similarity index 100%
rename from export-image/04-finalise/01-run.sh
rename to export-image/05-finalise/01-run.sh