diff --git a/.gitea/workflows/base-image-build.yml b/.gitea/workflows/base-image-build.yml
new file mode 100644
index 0000000..80474db
--- /dev/null
+++ b/.gitea/workflows/base-image-build.yml
@@ -0,0 +1,53 @@
+name: Build and Upload Multiple Debian RootFS Versions
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-debian-variants:
+    runs-on: docker
+
+    strategy:
+      matrix:
+        version: [buster, bullseye, bookworm, docker-build]
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+
+      - name: Build Docker image for ${{ matrix.version }}
+        run: |
+          docker build \
+            --build-arg VERSION=${{ matrix.version }} \
+            -t fithwum/debian-${{ matrix.version }}-base .
+
+      - name: Run rootfs builder (pt1 script)
+        run: |
+          docker run --rm --privileged \
+            -v "$(pwd)":/output \
+            fithwum/debian-${{ matrix.version }}-base \
+            bash base-image-script/debian-${{ matrix.version }}_pt1.sh
+
+      - name: List output archive
+        run: ls -lh *.tar.bz2
+
+      - name: Clone and push to Gitea repo
+        run: |
+          git config --global user.name "${{ secrets.GIT_USERNAME }}"
+          git config --global user.email "${{ secrets.GIT_EMAIL }}"
+
+          git clone "${{ secrets.GITEA_REPO_URL }}" upload-repo
+
+          # Ensure target folder exists and clean old tarballs
+          mkdir -p upload-repo/${{ matrix.version }}
+          find upload-repo/${{ matrix.version }} -name '*.tar.bz2' -type f -delete
+
+          # Copy new tarball to version folder
+          cp *.tar.bz2 upload-repo/${{ matrix.version }}/
+
+          cd upload-repo
+          git add ${{ matrix.version }}/*.tar.bz2
+          git commit -m "Update ${{ matrix.version }} base image on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+          git push
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..027ca85
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM debian:bullseye
+
+ARG VERSION
+ENV DEBIAN_FRONTEND=noninteractive
+WORKDIR /builder
+
+RUN apt-get update && apt-get install -y \
+    debootstrap wget curl bash ftp-upload dirmngr locales sudo git \
+    && apt-get clean
+
+# Setup locale
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
+    locale-gen && \
+    update-locale LANG=en_US.UTF-8
+
+COPY base-image-script/ base-image-script/
+
+RUN chmod +x base-image-script/*.sh
+
+# Default command overridden by workflow
+CMD ["bash"]
diff --git a/base-image-script/debian-bookworm_pt1.sh b/base-image-script/debian-bookworm_pt1.sh
index 6b2133a..a8bcdd1 100644
--- a/base-image-script/debian-bookworm_pt1.sh
+++ b/base-image-script/debian-bookworm_pt1.sh
@@ -6,43 +6,32 @@ set -o pipefail
 
 DEBIAN_RELEASE="bookworm"
 ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
-SCRIPTS_URL="https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/base-image-script/"
+SCRIPTS_DIR="base-image-script"
 PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
 PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
 apt-get upgrade -y
-apt-get install -y --no-install-recommends debootstrap bash curl wget ftp-upload dirmngr
+apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr
 
-echo "[INFO] Downloading extra scripts if missing..."
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./$SCRIPT" ]; then
-        echo "[INFO] Downloading $SCRIPT..."
-        wget --no-cache "$SCRIPTS_URL/$SCRIPT" -O "./$SCRIPT"
-        chmod +x "./$SCRIPT"
+    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+        exit 1
     fi
 done
 
-echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE..."
-debootstrap \
-  --variant=minbase \
-  --components=main,contrib,non-free \
-  --include=apt,ca-certificates \
-  --arch=amd64 \
-  "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/
+echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
+debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/
 
-echo "[INFO] Mounting system directories..."
 for dir in dev dev/pts proc sys; do
-    mount --bind /$dir "$ROOTFS_DIR/$dir"
+    mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-echo "[INFO] Copying pt2 script into chroot..."
-cp "./$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
-echo "[INFO] Entering chroot. Type 'exit' when done."
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-echo "[INFO] Running pt3 for packaging and upload..."
-./$PT3_SCRIPT "$ROOTFS_DIR"
+bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-bookworm_pt3.sh b/base-image-script/debian-bookworm_pt3.sh
index f82783e..30370a4 100644
--- a/base-image-script/debian-bookworm_pt3.sh
+++ b/base-image-script/debian-bookworm_pt3.sh
@@ -6,15 +6,15 @@ set -e
 ROOTFS_DIR="${1:-debian-bookworm}"
 TARBALL="${ROOTFS_DIR}.tar.bz2"
 
-echo "[INFO] Unmounting system directories..."
+echo "[INFO] Attempting to unmount system directories (ignore errors)..."
 for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir"
+    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
 done
 
 echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/debian-base_pt2.sh"
+rm -f "$ROOTFS_DIR/root/"debian-*_pt2.sh 2>/dev/null || true
 
-echo "[INFO] Showing rootfs size..."
+echo "[INFO] Rootfs size:"
 du -sh "$ROOTFS_DIR"
 
 echo "[INFO] Creating compressed base image..."
@@ -23,11 +23,6 @@ tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
 echo "[INFO] Image archive size:"
 du -sh "$TARBALL"
 
-# Optional: Upload via FTP
-# ftp-upload -v -h "$HOST" -u "$USER" --password "$PASS" -d /target/dir "$TARBALL"
-
-echo "[INFO] Cleaning up..."
-rm -rf "$ROOTFS_DIR"
-rm -f "$TARBALL"
-
-echo "[INFO] Done."
+# DO NOT DELETE TARBALL — needed by Gitea Action
+# DO NOT UPLOAD HERE — handled by workflow
+echo "[INFO] Leaving tarball for CI to upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-bullseye_pt1.sh b/base-image-script/debian-bullseye_pt1.sh
index a2b6d15..a9ccda9 100644
--- a/base-image-script/debian-bullseye_pt1.sh
+++ b/base-image-script/debian-bullseye_pt1.sh
@@ -1,59 +1,37 @@
 #!/bin/bash
-# Copyright (c) 2018 fithwum
+# Copyright (c) 2025 fithwum
 # All rights reserved
+set -e
+set -o pipefail
 
-RELEASE=stable
+DEBIAN_RELEASE="bullseye"
+ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+SCRIPTS_DIR="base-image-script"
+PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
+PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
 
-echo " "
-echo "INFO ! Downloading other parts of the script if needed."
-if [ -e /debian-bullseye_pt2.sh ]
-	then
-		echo "INFO ! debian-bullseye_pt2.sh found ... will not download."
-	else
-		echo " "
-		echo "WARNING ! debian-bullseye_pt2.sh not found ... will download new copy."
-			wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/refs/heads/master/base-image-script/debian-bullseye_pt2.sh -O /debian-bullseye_pt2.sh
-			chmod +x debian-bullseye_pt2.sh
-fi
-if [ -e /debian-bullseye_pt3.sh ]
-	then
-		echo "INFO ! debian-bullseye_pt3.sh found ... will not download."
-	else
-		echo " "
-		echo "WARNING ! debian-bullseye_pt3.sh not found ... will download new copy."
-			wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/refs/heads/master/base-image-script/debian-bullseye_pt3.sh -O /debian-bullseye_pt3.sh
-			chmod +x debian-bullseye_pt3.sh
-fi
-sleep 1
-echo " "
-echo "INFO ! Getting system updates."
-apt-get -y update
-apt-get -y upgrade
-apt-get -y dist-upgrade
-apt autoremove -y
-echo " "
-echo "INFO ! Installing debootstrap,ftp-upload,bash,dirmngr,curl."
-sleep 1
-apt-get install -y debootstrap ftp-upload bash dirmngr curl
-sleep 1
-echo " "
-echo "INFO ! Downloading debian & selected packages."
-debootstrap --keyring /etc/apt/trusted.gpg.d/debian-archive-bullseye-stable.gpg --force-check-gpg --variant=minbase --components=main,contrib,non-free --include=dirmngr,apt-transport-https,bash,software-properties-common,ca-certificates,wget,curl,nano --arch=amd64 bullseye /debian-bullseye http://deb.debian.org/debian/
-echo " "
-echo "INFO ! Filesystem size uncompressed."
-sleep 1
-du --human-readable --summarize debian-bullseye
-sleep 5
-echo " "
-echo "INFO ! Mounting folders for root."
-mount --bind /dev debian-bullseye/dev
-mount --bind /dev/pts debian-bullseye/dev/pts
-mount --bind /proc debian-bullseye/proc
-mount --bind /sys debian-bullseye/sys
-sleep 1
-cp -v debian-bullseye_pt2.sh /debian-bullseye
-echo " "
-echo "INFO ! Changeing to new root."
-sleep 1
-chroot debian-bullseye
-exit
+echo "[INFO] Preparing environment..."
+apt-get update -y
+apt-get upgrade -y
+apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr
+
+for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
+    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+        exit 1
+    fi
+done
+
+echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
+debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/
+
+for dir in dev dev/pts proc sys; do
+    mount --bind "/$dir" "$ROOTFS_DIR/$dir"
+done
+
+cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
+
+chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
+
+bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-bullseye_pt2.sh b/base-image-script/debian-bullseye_pt2.sh
index 70f72c2..5f25842 100644
--- a/base-image-script/debian-bullseye_pt2.sh
+++ b/base-image-script/debian-bullseye_pt2.sh
@@ -1,19 +1,26 @@
 #!/bin/bash
-# Copyright (c) 2018 fithwum
+# Copyright (c) 2025 fithwum
 # All rights reserved
+echo "[CHROOT] Configuring Debian system..."
+echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/10-assume_yes
 
-echo " "
-echo "APT::Get::Assume-Yes \"true\";" | tee /etc/apt/apt.conf.d/10-assume_yes
-sleep 1
-echo " "
-echo "INFO ! Removeing unnecessary packages."
-apt-get remove --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode
-sleep 1
-echo " "
-echo "INFO ! Cleanup."
+apt-get update
+apt-get upgrade
+
+apt-get install --no-install-recommends software-properties-common bash wget curl nano locales
+
+echo "[CHROOT] Generating locales..."
+echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+locale-gen
+update-locale LANG=en_US.UTF-8
+
+echo "[CHROOT] Removing unnecessary packages..."
+apt-get remove --purge --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode || true
+
+echo "[CHROOT] Cleaning up..."
 apt-get clean
-find /var/lib/apt/lists/ -maxdepth 2 -type f -delete
-sleep 1
-echo " "
-echo "INFO ! Type "exit" and reboot for final steps."
+apt-get install -f
+find /var/lib/apt/lists/ -type f -delete
+
+echo "[CHROOT] Done. Type 'exit' to return."
 exit
diff --git a/base-image-script/debian-bullseye_pt3.sh b/base-image-script/debian-bullseye_pt3.sh
index 1176315..9fecb4e 100644
--- a/base-image-script/debian-bullseye_pt3.sh
+++ b/base-image-script/debian-bullseye_pt3.sh
@@ -1,33 +1,28 @@
 #!/bin/bash
-# Copyright (c) 2018 fithwum
+# Copyright (c) 2025 fithwum
 # All rights reserved
+set -e
 
-echo " "
-echo "INFO ! Cleaning up pt2 of script from base image."
-rm -frv /debian-bullseye/debian-bullseye_pt2.sh
-sleep 1
-echo " "
-echo "INFO ! Base image size after cleanup."
-du --human-readable --summarize debian-bullseye
-sleep 5
-echo " "
-echo "INFO ! Creating base image archive."
-echo "INFO ! This may take some time."
-tar -cjf debian-bullseye.tar.bz2 --directory debian-bullseye .
-sleep 1
-echo " "
-echo "INFO ! Base image archive."
-du --human-readable --summarize debian-bullseye.tar.bz2
-sleep 5
-echo " "
-echo "INFO ! Uploading image to ftp server."
-ftp-upload -v -h {IP}:{PORT} -u {USER} --password {PASSWORD} -d /mnt/user/FTP debian-bullseye.tar.bz2
-sleep 1
-echo " "
-echo "INFO ! Removing temp files."
-rm -fr debian-bullseye
-rm -frv debian-bullseye.tar.bz2
-echo " "
-echo "INFO ! Done."
-echo " "
-exit
+ROOTFS_DIR="${1:-debian-bullseye}"
+TARBALL="${ROOTFS_DIR}.tar.bz2"
+
+echo "[INFO] Attempting to unmount system directories (ignore errors)..."
+for dir in sys proc dev/pts dev; do
+    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
+done
+
+echo "[INFO] Removing chroot script..."
+rm -f "$ROOTFS_DIR/root/"debian-*_pt2.sh 2>/dev/null || true
+
+echo "[INFO] Rootfs size:"
+du -sh "$ROOTFS_DIR"
+
+echo "[INFO] Creating compressed base image..."
+tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
+
+echo "[INFO] Image archive size:"
+du -sh "$TARBALL"
+
+# DO NOT DELETE TARBALL — needed by Gitea Action
+# DO NOT UPLOAD HERE — handled by workflow
+echo "[INFO] Leaving tarball for CI to upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-buster_pt1.sh b/base-image-script/debian-buster_pt1.sh
index 8f88614..7b8f3ef 100644
--- a/base-image-script/debian-buster_pt1.sh
+++ b/base-image-script/debian-buster_pt1.sh
@@ -1,59 +1,37 @@
 #!/bin/bash
-# Copyright (c) 2018 fithwum
+# Copyright (c) 2025 fithwum
 # All rights reserved
+set -e
+set -o pipefail
 
-RELEASE=stable
+DEBIAN_RELEASE="buster"
+ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+SCRIPTS_DIR="base-image-script"
+PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
+PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
 
-echo " "
-echo "INFO ! Downloading other parts of the script if needed."
-if [ -e /debian-buster_pt2.sh ]
-	then
-		echo "INFO ! debian-buster_pt2.sh found ... will not download."
-	else
-		echo " "
-		echo "WARNING ! debian-buster_pt2.sh not found ... will download new copy."
-			wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/refs/heads/master/base-image-script/debian-buster_pt2.sh -O /debian-buster_pt2.sh
-			chmod +x debian-buster_pt2.sh
-fi
-if [ -e /debian-buster_pt3.sh ]
-	then
-		echo "INFO ! debian-buster_pt3.sh found ... will not download."
-	else
-		echo " "
-		echo "WARNING ! debian-buster_pt3.sh not found ... will download new copy."
-			wget --no-cache https://raw.githubusercontent.com/fithwum/files-for-dockers/refs/heads/master/base-image-script/debian-buster_pt3.sh -O /debian-buster_pt3.sh
-			chmod +x debian-buster_pt3.sh
-fi
-sleep 1
-echo " "
-echo "INFO ! Getting system updates."
-apt-get -y update
-apt-get -y upgrade
-apt-get -y dist-upgrade
-apt autoremove -y
-echo " "
-echo "INFO ! Installing debootstrap,ftp-upload,bash,dirmngr,curl."
-sleep 1
-apt-get install -y debootstrap ftp-upload bash dirmngr curl
-sleep 1
-echo " "
-echo "INFO ! Downloading debian & selected packages."
-debootstrap --keyring /etc/apt/trusted.gpg.d/debian-archive-buster-stable.gpg --force-check-gpg --variant=minbase --components=main,contrib,non-free --include=dirmngr,apt-transport-https,bash,software-properties-common,ca-certificates,wget,curl,nano --arch=amd64 buster /debian-buster http://deb.debian.org/debian/
-echo " "
-echo "INFO ! Filesystem size uncompressed."
-sleep 1
-du --human-readable --summarize debian-buster
-sleep 5
-echo " "
-echo "INFO ! Mounting folders for root."
-mount --bind /dev debian-buster/dev
-mount --bind /dev/pts debian-buster/dev/pts
-mount --bind /proc debian-buster/proc
-mount --bind /sys debian-buster/sys
-sleep 1
-cp -v debian-buster_pt2.sh /debian-buster
-echo " "
-echo "INFO ! Changeing to new root."
-sleep 1
-chroot debian-buster
-exit
+echo "[INFO] Preparing environment..."
+apt-get update -y
+apt-get upgrade -y
+apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr
+
+for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
+    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+        exit 1
+    fi
+done
+
+echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
+debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/
+
+for dir in dev dev/pts proc sys; do
+    mount --bind "/$dir" "$ROOTFS_DIR/$dir"
+done
+
+cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
+
+chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
+
+bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-buster_pt2.sh b/base-image-script/debian-buster_pt2.sh
index 70f72c2..4a38213 100644
--- a/base-image-script/debian-buster_pt2.sh
+++ b/base-image-script/debian-buster_pt2.sh
@@ -1,19 +1,21 @@
 #!/bin/bash
-# Copyright (c) 2018 fithwum
+# Copyright (c) 2025 fithwum
 # All rights reserved
+echo "[CHROOT] Configuring Debian system..."
+echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/10-assume_yes
 
-echo " "
-echo "APT::Get::Assume-Yes \"true\";" | tee /etc/apt/apt.conf.d/10-assume_yes
-sleep 1
-echo " "
-echo "INFO ! Removeing unnecessary packages."
-apt-get remove --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode
-sleep 1
-echo " "
-echo "INFO ! Cleanup."
+apt-get update
+apt-get upgrade
+
+apt-get install --no-install-recommends software-properties-common bash wget curl nano locales
+
+echo "[CHROOT] Removing unnecessary packages..."
+apt-get remove --purge --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode || true
+
+echo "[CHROOT] Cleaning up..."
 apt-get clean
-find /var/lib/apt/lists/ -maxdepth 2 -type f -delete
-sleep 1
-echo " "
-echo "INFO ! Type "exit" and reboot for final steps."
-exit
+apt-get install -f
+find /var/lib/apt/lists/ -type f -delete
+
+echo "[CHROOT] Done. Exiting."
+exit
\ No newline at end of file
diff --git a/base-image-script/debian-buster_pt3.sh b/base-image-script/debian-buster_pt3.sh
index ec006c2..55a2a2b 100644
--- a/base-image-script/debian-buster_pt3.sh
+++ b/base-image-script/debian-buster_pt3.sh
@@ -1,33 +1,21 @@
 #!/bin/bash
-# Copyright (c) 2018 fithwum
+# Copyright (c) 2025 fithwum
 # All rights reserved
+set -e
 
-echo " "
-echo "INFO ! Cleaning up pt2 of script from base image."
-rm -frv /debian-buster/debian-buster_pt2.sh
-sleep 1
-echo " "
-echo "INFO ! Base image size after cleanup."
-du --human-readable --summarize debian-buster
-sleep 5
-echo " "
-echo "INFO ! Creating base image archive."
-echo "INFO ! This may take some time."
-tar -cjf debian-buster.tar.bz2 --directory debian-buster .
-sleep 1
-echo " "
-echo "INFO ! Base image archive."
-du --human-readable --summarize debian-buster.tar.bz2
-sleep 5
-echo " "
-echo "INFO ! Uploading image to ftp server."
-ftp-upload -v -h {IP}:{PORT} -u {USER} --password {PASSWORD} -d /mnt/user/FTP debian-buster.tar.bz2
-sleep 1
-echo " "
-echo "INFO ! Removing temp files."
-rm -fr debian-buster
-rm -frv debian-buster.tar.bz2
-echo " "
-echo "INFO ! Done."
-echo " "
-exit
+ROOTFS_DIR="${1:-debian-buster}"
+TARBALL="${ROOTFS_DIR}.tar.bz2"
+
+for dir in sys proc dev/pts dev; do
+    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
+done
+
+rm -f "$ROOTFS_DIR/root/debian-buster_pt2.sh" 2>/dev/null || true
+
+du -sh "$ROOTFS_DIR"
+
+tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
+
+du -sh "$TARBALL"
+
+echo "[INFO] Tarball ready for upload: $TARBALL"
\ No newline at end of file
diff --git a/base-image-script/debian-docker-build_pt1.sh b/base-image-script/debian-docker-build_pt1.sh
index 0324eca..19d210f 100644
--- a/base-image-script/debian-docker-build_pt1.sh
+++ b/base-image-script/debian-docker-build_pt1.sh
@@ -4,45 +4,34 @@
 set -e
 set -o pipefail
 
-DEBIAN_RELEASE="bookworm"
-ROOTFS_DIR="debian-docker-build"
-SCRIPTS_URL="https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/base-image-script/"
-PT2_SCRIPT="debian-docker-build_pt2.sh"
-PT3_SCRIPT="debian-docker-build_pt3.sh"
+DEBIAN_RELEASE="docker-build"
+ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+SCRIPTS_DIR="base-image-script"
+PT2_SCRIPT="debian-${DEBIAN_RELEASE}_pt2.sh"
+PT3_SCRIPT="debian-${DEBIAN_RELEASE}_pt3.sh"
 
 echo "[INFO] Preparing environment..."
 apt-get update -y
 apt-get upgrade -y
-apt-get install -y --no-install-recommends debootstrap bash curl wget ftp-upload dirmngr
+apt-get install -y --no-install-recommends debootstrap bash curl wget dirmngr
 
-echo "[INFO] Downloading extra scripts if missing..."
 for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do
-    if [ ! -f "./$SCRIPT" ]; then
-        echo "[INFO] Downloading $SCRIPT..."
-        wget --no-cache "$SCRIPTS_URL/$SCRIPT" -O "./$SCRIPT"
-        chmod +x "./$SCRIPT"
+    if [ ! -f "./${SCRIPTS_DIR}/$SCRIPT" ]; then
+        echo "[ERROR] Missing script: ${SCRIPTS_DIR}/$SCRIPT"
+        exit 1
     fi
 done
 
-echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE..."
-debootstrap \
-  --variant=minbase \
-  --components=main,contrib,non-free \
-  --include=apt,ca-certificates \
-  --arch=amd64 \
-  "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/
+echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
+debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 bookworm "$ROOTFS_DIR" http://deb.debian.org/debian/
 
-echo "[INFO] Mounting system directories..."
 for dir in dev dev/pts proc sys; do
-    mount --bind /$dir "$ROOTFS_DIR/$dir"
+    mount --bind "/$dir" "$ROOTFS_DIR/$dir"
 done
 
-echo "[INFO] Copying pt2 script into chroot..."
-cp "./$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
+cp "./${SCRIPTS_DIR}/$PT2_SCRIPT" "$ROOTFS_DIR/root/$PT2_SCRIPT"
 chmod +x "$ROOTFS_DIR/root/$PT2_SCRIPT"
 
-echo "[INFO] Entering chroot. Type 'exit' when done."
 chroot "$ROOTFS_DIR" /root/$PT2_SCRIPT
 
-echo "[INFO] Running pt3 for packaging and upload..."
-./$PT3_SCRIPT "$ROOTFS_DIR"
+bash "./${SCRIPTS_DIR}/$PT3_SCRIPT" "$ROOTFS_DIR"
\ No newline at end of file
diff --git a/base-image-script/debian-docker-build_pt3.sh b/base-image-script/debian-docker-build_pt3.sh
index f82783e..30370a4 100644
--- a/base-image-script/debian-docker-build_pt3.sh
+++ b/base-image-script/debian-docker-build_pt3.sh
@@ -6,15 +6,15 @@ set -e
 ROOTFS_DIR="${1:-debian-bookworm}"
 TARBALL="${ROOTFS_DIR}.tar.bz2"
 
-echo "[INFO] Unmounting system directories..."
+echo "[INFO] Attempting to unmount system directories (ignore errors)..."
 for dir in sys proc dev/pts dev; do
-    umount -lf "$ROOTFS_DIR/$dir"
+    umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
 done
 
 echo "[INFO] Removing chroot script..."
-rm -f "$ROOTFS_DIR/root/debian-base_pt2.sh"
+rm -f "$ROOTFS_DIR/root/"debian-*_pt2.sh 2>/dev/null || true
 
-echo "[INFO] Showing rootfs size..."
+echo "[INFO] Rootfs size:"
 du -sh "$ROOTFS_DIR"
 
 echo "[INFO] Creating compressed base image..."
@@ -23,11 +23,6 @@ tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
 echo "[INFO] Image archive size:"
 du -sh "$TARBALL"
 
-# Optional: Upload via FTP
-# ftp-upload -v -h "$HOST" -u "$USER" --password "$PASS" -d /target/dir "$TARBALL"
-
-echo "[INFO] Cleaning up..."
-rm -rf "$ROOTFS_DIR"
-rm -f "$TARBALL"
-
-echo "[INFO] Done."
+# DO NOT DELETE TARBALL — needed by Gitea Action
+# DO NOT UPLOAD HERE — handled by workflow
+echo "[INFO] Leaving tarball for CI to upload: $TARBALL"
\ No newline at end of file