Rename config files: Add '_deb11' to cfg name and resulting IMG_NAME; Add a 'raspi_deb10_armhf' cfg

16 files changed, 211 insertions, 24 deletions

diff --git a/scripts/01-build-debian_amd64-rw-light-jau.cfg b/scripts/01-build-debian_deb11_amd64-rw-light-jau.cfg
index 00b3378..75d5963 100644
--- a/scripts/01-build-debian_amd64-rw-light-jau.cfg
+++ b/scripts/01-build-debian_deb11_amd64-rw-light-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-debian_amd64-rw-lightxdev-jau.cfg b/scripts/01-build-debian_deb11_amd64-rw-lightxdev-jau.cfg
index 25feaa6..a987cae 100644
--- a/scripts/01-build-debian_amd64-rw-lightxdev-jau.cfg
+++ b/scripts/01-build-debian_deb11_amd64-rw-lightxdev-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-debian_amd64-rw-lightxdev.cfg b/scripts/01-build-debian_deb11_amd64-rw-lightxdev.cfg
index cc95db5..76942e9 100644
--- a/scripts/01-build-debian_amd64-rw-lightxdev.cfg
+++ b/scripts/01-build-debian_deb11_amd64-rw-lightxdev.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-raspi_deb10_armhf-rw-lightxdev-jau.cfg b/scripts/01-build-raspi_deb10_armhf-rw-lightxdev-jau.cfg
new file mode 100644
index 0000000..f4a700f
--- /dev/null
+++ b/scripts/01-build-raspi_deb10_armhf-rw-lightxdev-jau.cfg
@@ -0,0 +1,48 @@
+#! /bin/bash
+
+export TARGET_RASPI="1"
+export TARGET_ARCH="armhf"
+
+# export RELEASE=bullseye
+export RELEASE=buster
+
+# Produce a read-only rootfs
+# export ROOTFS_RO=1
+# export REDUCED_FOOTPRINT=1
+
+export APT_PROXY=http://jordan:3142
+
+export CUSTOM_NAME="RaspiArm32LightDev"
+export CUSTOM_VERSION="1.2-rw"
+
+export PI_GEN="pi-gen (jau branch)"
+
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb10-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb10-${TARGET_ARCH}-work"
+export IMG_FILENAME=${IMG_NAME}
+
+export DEPLOY_DIR=/data/diskimages
+export DEPLOY_ZIP=0
+
+#export USE_QEMU=1
+
+export TARGET_HOSTNAME=deb10arm32raspi
+
+export LOCALE_DEFAULT=en_US.UTF-8
+export KEYBOARD_KEYMAP=us
+export KEYBOARD_LAYOUT="English (US)"
+export TIMEZONE_DEFAULT="Europe/Berlin"
+
+export FIRST_USER_NAME="pi"
+export FIRST_USER_PASS="pi"
+export ENABLE_SSH=1
+export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx"
+export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]"
+export PUBKEY_ONLY_SSH=1
+
+export STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev"
+#export SKIP_STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev"
+
+#export SKIP_IMAGES_LIST="stage2 stage3a stage3a_dev"
+export SKIP_IMAGES_LIST="stage2 stage3a"
+
diff --git a/scripts/01-build-raspi_arm64-rw-light-jau.cfg b/scripts/01-build-raspi_deb11_arm64-rw-light-jau.cfg
index bf1546d..e5cf0e1 100644
--- a/scripts/01-build-raspi_arm64-rw-light-jau.cfg
+++ b/scripts/01-build-raspi_deb11_arm64-rw-light-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (jau branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-raspi_deb11_arm64-rw-light.cfg b/scripts/01-build-raspi_deb11_arm64-rw-light.cfg
new file mode 100644
index 0000000..fda378c
--- /dev/null
+++ b/scripts/01-build-raspi_deb11_arm64-rw-light.cfg
@@ -0,0 +1,46 @@
+#! /bin/bash
+
+export TARGET_RASPI="1"
+export TARGET_ARCH="arm64"
+
+export RELEASE=bullseye
+# export RELEASE=buster
+
+# Produce a read-only rootfs
+# export ROOTFS_RO=1
+# export REDUCED_FOOTPRINT=1
+
+# export APT_PROXY=http://jordan:3142
+
+export CUSTOM_NAME="RaspiArm64Light"
+export CUSTOM_VERSION="1.2-rw"
+
+export PI_GEN="pi-gen (custom branch)"
+
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
+export IMG_FILENAME=${IMG_NAME}
+
+export DEPLOY_DIR=/data/diskimages
+export DEPLOY_ZIP=0
+
+#export USE_QEMU=1
+
+export TARGET_HOSTNAME=deb11arm64raspi
+
+export LOCALE_DEFAULT=en_US.UTF-8
+export KEYBOARD_KEYMAP=us
+export KEYBOARD_LAYOUT="English (US)"
+export TIMEZONE_DEFAULT="Europe/Berlin"
+
+export FIRST_USER_NAME="pi"
+export FIRST_USER_PASS="pi"
+export ENABLE_SSH=1
+# export PUBKEY_SSH_FIRST_USER="ssh-rsa long-number my@machine"
+# export PUBKEY_ONLY_SSH=1
+
+export STAGE_LIST="stage0 stage1 stage2"
+#export SKIP_STAGE_LIST="stage0 stage1 stage2"
+
+#export SKIP_IMAGES_LIST="stage2"
+
diff --git a/scripts/01-build-raspi_arm64-rw-lightxdev-jau.cfg b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev-jau.cfg
index 66c0e3a..ef1f3af 100644
--- a/scripts/01-build-raspi_arm64-rw-lightxdev-jau.cfg
+++ b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (jau branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-raspi_arm64-rw-lightxdev.cfg b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev.cfg
index 735aebd..ed99100 100644
--- a/scripts/01-build-raspi_arm64-rw-lightxdev.cfg
+++ b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-raspi_deb11_armhf-rw-light-jau.cfg b/scripts/01-build-raspi_deb11_armhf-rw-light-jau.cfg
new file mode 100644
index 0000000..91f1273
--- /dev/null
+++ b/scripts/01-build-raspi_deb11_armhf-rw-light-jau.cfg
@@ -0,0 +1,47 @@
+#! /bin/bash
+
+export TARGET_RASPI="1"
+export TARGET_ARCH="armhf"
+
+export RELEASE=bullseye
+# export RELEASE=buster
+
+# Produce a read-only rootfs
+# export ROOTFS_RO=1
+# export REDUCED_FOOTPRINT=1
+
+export APT_PROXY=http://jordan:3142
+
+export CUSTOM_NAME="RaspiArm32Light"
+export CUSTOM_VERSION="1.2-rw"
+
+export PI_GEN="pi-gen (jau branch)"
+
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
+export IMG_FILENAME=${IMG_NAME}
+
+export DEPLOY_DIR=/data/diskimages
+export DEPLOY_ZIP=0
+
+#export USE_QEMU=1
+
+export TARGET_HOSTNAME=deb11arm32raspi
+
+export LOCALE_DEFAULT=en_US.UTF-8
+export KEYBOARD_KEYMAP=us
+export KEYBOARD_LAYOUT="English (US)"
+export TIMEZONE_DEFAULT="Europe/Berlin"
+
+export FIRST_USER_NAME="pi"
+export FIRST_USER_PASS="pi"
+export ENABLE_SSH=1
+export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx"
+export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]"
+export PUBKEY_ONLY_SSH=1
+
+export STAGE_LIST="stage0 stage1 stage2"
+#export SKIP_STAGE_LIST="stage0 stage1 stage2"
+
+#export SKIP_IMAGES_LIST="stage2"
+
diff --git a/scripts/01-build-raspi_deb11_armhf-rw-light.cfg b/scripts/01-build-raspi_deb11_armhf-rw-light.cfg
new file mode 100644
index 0000000..04f7f8e
--- /dev/null
+++ b/scripts/01-build-raspi_deb11_armhf-rw-light.cfg
@@ -0,0 +1,46 @@
+#! /bin/bash
+
+export TARGET_RASPI="1"
+export TARGET_ARCH="armhf"
+
+export RELEASE=bullseye
+# export RELEASE=buster
+
+# Produce a read-only rootfs
+# export ROOTFS_RO=1
+# export REDUCED_FOOTPRINT=1
+
+# export APT_PROXY=http://jordan:3142
+
+export CUSTOM_NAME="RaspiArm32Light"
+export CUSTOM_VERSION="1.2-rw"
+
+export PI_GEN="pi-gen (custom branch)"
+
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
+export IMG_FILENAME=${IMG_NAME}
+
+export DEPLOY_DIR=/data/diskimages
+export DEPLOY_ZIP=0
+
+#export USE_QEMU=1
+
+export TARGET_HOSTNAME=deb11arm32raspi
+
+export LOCALE_DEFAULT=en_US.UTF-8
+export KEYBOARD_KEYMAP=us
+export KEYBOARD_LAYOUT="English (US)"
+export TIMEZONE_DEFAULT="Europe/Berlin"
+
+export FIRST_USER_NAME="pi"
+export FIRST_USER_PASS="pi"
+export ENABLE_SSH=1
+# export PUBKEY_SSH_FIRST_USER="ssh-rsa long-number my@machine"
+# export PUBKEY_ONLY_SSH=1
+
+export STAGE_LIST="stage0 stage1 stage2"
+#export SKIP_STAGE_LIST="stage0 stage1 stage2"
+
+#export SKIP_IMAGES_LIST="stage2"
+
diff --git a/scripts/01-build-raspi_armhf-rw-lightxdev-jau.cfg b/scripts/01-build-raspi_deb11_armhf-rw-lightxdev-jau.cfg
index 1019cb2..d005fdc 100644
--- a/scripts/01-build-raspi_armhf-rw-lightxdev-jau.cfg
+++ b/scripts/01-build-raspi_deb11_armhf-rw-lightxdev-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (jau branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/01-build-raspi_armhf-rw-lightxdev.cfg b/scripts/01-build-raspi_deb11_armhf-rw-lightxdev.cfg
index 9b6b399..855a901 100644
--- a/scripts/01-build-raspi_armhf-rw-lightxdev.cfg
+++ b/scripts/01-build-raspi_deb11_armhf-rw-lightxdev.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/02-build-raspi_arm64-ro-smalldesk-jau.cfg b/scripts/02-build-raspi_deb11_arm64-ro-smalldesk-jau.cfg
index 35bbb00..4d573b9 100644
--- a/scripts/02-build-raspi_arm64-ro-smalldesk-jau.cfg
+++ b/scripts/02-build-raspi_deb11_arm64-ro-smalldesk-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-ro"
 
 export PI_GEN="pi-gen (jau branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/02-build-raspi_arm64-ro-smalldesk.cfg b/scripts/02-build-raspi_deb11_arm64-ro-smalldesk.cfg
index 94de791..d212628 100644
--- a/scripts/02-build-raspi_arm64-ro-smalldesk.cfg
+++ b/scripts/02-build-raspi_deb11_arm64-ro-smalldesk.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-ro"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/03-build-debian_amd64-ro-rescue-jau.cfg b/scripts/03-build-debian_deb11_amd64-ro-rescue-jau.cfg
index 5ccc5ef..ae279e8 100644
--- a/scripts/03-build-debian_amd64-ro-rescue-jau.cfg
+++ b/scripts/03-build-debian_deb11_amd64-ro-rescue-jau.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-ro"
 
 export PI_GEN="pi-gen (jau branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages
diff --git a/scripts/03-build-debian_amd64-ro-rescue.cfg b/scripts/03-build-debian_deb11_amd64-ro-rescue.cfg
index 84a43d0..d5b332c 100644
--- a/scripts/03-build-debian_amd64-ro-rescue.cfg
+++ b/scripts/03-build-debian_deb11_amd64-ro-rescue.cfg
@@ -17,8 +17,8 @@ export CUSTOM_VERSION="1.2-ro"
 
 export PI_GEN="pi-gen (custom branch)"
 
-export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}"
-export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work"
+export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}"
+export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-deb11-${TARGET_ARCH}-work"
 export IMG_FILENAME=${IMG_NAME}
 
 export DEPLOY_DIR=/data/diskimages