diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml
index 2079477..21838af 100644
--- a/.gitea/workflows/pipeline.yml
+++ b/.gitea/workflows/pipeline.yml
@@ -5,16 +5,16 @@ name: Build and Push Multi-Arch Docker Images
 on:
   push:
     branches:
-      - main
+      - master
     paths:
-      - 'buster/Dockerfile'
-      - 'bullseye/Dockerfile'
-      - 'bookworm/Dockerfile'
-      - 'docker-build/Dockerfile'
-      - 'buster/**'
-      - 'bullseye/**'
-      - 'bookworm/**'
-      - 'docker-build/**'
+      - 'debian/buster/Dockerfile'
+      - 'debian/bullseye/Dockerfile'
+      - 'debian/bookworm/Dockerfile'
+      - 'debian/docker-build/Dockerfile'
+      - 'debian/buster/**'
+      - 'debian/bullseye/**'
+      - 'debian/bookworm/**'
+      - 'debian/docker-build/**'
 
 jobs:
   build:
@@ -65,22 +65,22 @@ jobs:
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_BUSTER} \
-            ./buster
+            ./debian/buster
 
       - name: Build and Push bullseye Docker Image
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_BULLSEYE} \
-            ./bullseye
+            ./debian/bullseye
 
       - name: Build and Push bookworm Docker Image
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_BOOKWORM} \
-            ./bookworm
+            ./debian/bookworm
 
       - name: Build and Push docker-build Docker Image
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_DOCKER_BUILD} \
-            ./docker-build
+            ./debian/docker-build
diff --git a/build-script/debian-bookworm_pt1.sh b/build-script/debian-bookworm_pt1.sh
index 8eb82d3..92bcd8d 100644
--- a/build-script/debian-bookworm_pt1.sh
+++ b/build-script/debian-bookworm_pt1.sh
@@ -12,7 +12,7 @@ if [ -e /debian-bookworm_pt2.sh ]
 	else
 		echo " "
 		echo "WARNING ! debian-bookworm_pt2.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-bookworm_pt2.sh -O /debian-bookworm_pt2.sh
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-bookworm_pt2.sh -O /debian-bookworm_pt2.sh
 			chmod +x debian-bookworm_pt2.sh
 fi
 if [ -e /debian-bookworm_pt3.sh ]
@@ -21,7 +21,7 @@ if [ -e /debian-bookworm_pt3.sh ]
 	else
 		echo " "
 		echo "WARNING ! debian-bookworm_pt3.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-bookworm_pt3.sh -O /debian-bookworm_pt3.sh
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-bookworm_pt3.sh -O /debian-bookworm_pt3.sh
 			chmod +x debian-bookworm_pt3.sh
 fi
 sleep 1
diff --git a/build-script/debian-bullseye_pt1.sh b/build-script/debian-bullseye_pt1.sh
index 90b76e2..5d1159b 100644
--- a/build-script/debian-bullseye_pt1.sh
+++ b/build-script/debian-bullseye_pt1.sh
@@ -12,7 +12,7 @@ if [ -e /debian-bullseye_pt2.sh ]
 	else
 		echo " "
 		echo "WARNING ! debian-bullseye_pt2.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-bullseye_pt2.sh -O /debian-bullseye_pt2.sh
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-bullseye_pt2.sh -O /debian-bullseye_pt2.sh
 			chmod +x debian-bullseye_pt2.sh
 fi
 if [ -e /debian-bullseye_pt3.sh ]
@@ -21,7 +21,7 @@ if [ -e /debian-bullseye_pt3.sh ]
 	else
 		echo " "
 		echo "WARNING ! debian-bullseye_pt3.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-bullseye_pt3.sh -O /debian-bullseye_pt3.sh
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-bullseye_pt3.sh -O /debian-bullseye_pt3.sh
 			chmod +x debian-bullseye_pt3.sh
 fi
 sleep 1
diff --git a/build-script/debian-buster_pt1.sh b/build-script/debian-buster_pt1.sh
index aa027a1..248ae40 100644
--- a/build-script/debian-buster_pt1.sh
+++ b/build-script/debian-buster_pt1.sh
@@ -12,7 +12,7 @@ if [ -e /debian-buster_pt2.sh ]
 	else
 		echo " "
 		echo "WARNING ! debian-buster_pt2.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-buster_pt2.sh -O /debian-buster_pt2.sh
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-buster_pt2.sh -O /debian-buster_pt2.sh
 			chmod +x debian-buster_pt2.sh
 fi
 if [ -e /debian-buster_pt3.sh ]
@@ -21,7 +21,7 @@ if [ -e /debian-buster_pt3.sh ]
 	else
 		echo " "
 		echo "WARNING ! debian-buster_pt3.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-buster_pt3.sh -O /debian-buster_pt3.sh
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-buster_pt3.sh -O /debian-buster_pt3.sh
 			chmod +x debian-buster_pt3.sh
 fi
 sleep 1
diff --git a/build-script/debian-docker-build_pt1.sh b/build-script/debian-docker-build_pt1.sh
index 8eb82d3..964e801 100644
--- a/build-script/debian-docker-build_pt1.sh
+++ b/build-script/debian-docker-build_pt1.sh
@@ -6,23 +6,23 @@ RELEASE=stable
 
 echo " "
 echo "INFO ! Downloading other parts of the script if needed."
-if [ -e /debian-bookworm_pt2.sh ]
+if [ -e /debian-docker-build_pt2.sh ]
 	then
-		echo "INFO ! debian-bookworm_pt2.sh found ... will not download."
+		echo "INFO ! debian-docker-build_pt2.sh found ... will not download."
 	else
 		echo " "
-		echo "WARNING ! debian-bookworm_pt2.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-bookworm_pt2.sh -O /debian-bookworm_pt2.sh
-			chmod +x debian-bookworm_pt2.sh
+		echo "WARNING ! debian-docker-build_pt2.sh not found ... will download new copy."
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-docker-build_pt2.sh -O /debian-docker-build_pt2.sh
+			chmod +x debian-docker-build_pt2.sh
 fi
-if [ -e /debian-bookworm_pt3.sh ]
+if [ -e /debian-docker-build_pt3.sh ]
 	then
-		echo "INFO ! debian-bookworm_pt3.sh found ... will not download."
+		echo "INFO ! debian-docker-build_pt3.sh found ... will not download."
 	else
 		echo " "
-		echo "WARNING ! debian-bookworm_pt3.sh not found ... will download new copy."
-			wget --no-cache https://gitea.fithwum.tech/fithwum/base-image/raw/branch/main/build-script/debian-bookworm_pt3.sh -O /debian-bookworm_pt3.sh
-			chmod +x debian-bookworm_pt3.sh
+		echo "WARNING ! debian-docker-build_pt3.sh not found ... will download new copy."
+			wget --no-cache https://raw.githubusercontent.com/fithwum/base-image/refs/heads/main/build-script/debian-docker-build_pt3.sh -O /debian-docker-build_pt3.sh
+			chmod +x debian-docker-build_pt3.sh
 fi
 sleep 1
 echo " "
@@ -38,7 +38,7 @@ apt-get install -y debootstrap ftp-upload bash dirmngr curl
 sleep 1
 echo " "
 echo "INFO ! Downloading debian & selected packages."
-debootstrap --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 bookworm /debian-bookworm http://deb.debian.org/debian/
+debootstrap --force-check-gpg --variant=minbase --components=main,contrib,non-free --include=dirmngr,apt-transport-https,bash,software-properties-common,ca-certificates,wget,curl,nano,docker --arch=amd64 bookworm /debian-bookworm http://deb.debian.org/debian/
 echo " "
 echo "INFO ! Filesystem size uncompressed."
 sleep 1
diff --git a/debian/docker-build/Dockerfile b/debian/docker-build/Dockerfile
index 1b7fad3..14172b1 100644
--- a/debian/docker-build/Dockerfile
+++ b/debian/docker-build/Dockerfile
@@ -1,4 +1,4 @@
 FROM scratch
 LABEL maintainer "fithwum"
-ADD /debian-bookworm.tar.bz2 /
+ADD /debian-docker-build.tar.bz2 /
 CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/debian/docker-build/debian-bookworm.tar.bz2 b/debian/docker-build/debian-docker-build.tar.bz2
similarity index 76%
rename from debian/docker-build/debian-bookworm.tar.bz2
rename to debian/docker-build/debian-docker-build.tar.bz2
index a6db7a1..22c815e 100644
Binary files a/debian/docker-build/debian-bookworm.tar.bz2 and b/debian/docker-build/debian-docker-build.tar.bz2 differ
diff --git a/test_build_base.sh b/test_build_base.sh
old mode 100755
new mode 100644
index e48df83..beffbb9
--- a/test_build_base.sh
+++ b/test_build_base.sh
@@ -5,4 +5,5 @@
 docker build --pull --rm -f "debian/buster/Dockerfile" -t gitea.fithwum.tech/fithwum/base-image:debian-buster "debian/buster"
 docker build --pull --rm -f "debian/bullseye/Dockerfile" -t gitea.fithwum.tech/fithwum/base-image:debian-bullseye "debian/bullseye"
 docker build --pull --rm -f "debian/bookworm/Dockerfile" -t gitea.fithwum.tech/fithwum/base-image:debian-bookworm "debian/bookworm"
+docker build --pull --rm -f "debian/bookworm/Dockerfile" -t gitea.fithwum.tech/fithwum/base-image:docker-build "debian/docker-build"
 docker push -a gitea.fithwum.tech/fithwum/base-image