diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 5d04e5e..fcec767 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -1,13 +1,71 @@
-name: Build and Push Multi-Arch Docker Images
+name: Build RootFS Archives and Push Docker Images
 
 on:
   push:
     branches:
       - main
+    # paths:
+      # - 'base-image-script/**'
+  schedule:
+    - cron: '0 12 * * 0'  # Sunday noon UTC
 
 jobs:
-  build:
+  build-rootfs-archives:
     runs-on: docker-build
+    strategy:
+      matrix:
+        version: [buster, bullseye, bookworm, docker-build]
+
+    steps:
+      - name: Checkout code
+        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: |
+          echo "[INFO] Looking for tarballs in workspace..."
+          find . -name '*.tar.bz2' -ls
+
+      - name: Push tarball archives to repo
+        env:
+          GIT_USER: ${{ secrets.GIT_USERNAME }}
+          GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
+          REPO_URL: ${{ secrets.REPO_URL }}
+        run: |
+          git config --global user.name "$GIT_USER"
+          git config --global user.email "$GIT_EMAIL"
+
+          git clone "$REPO_URL" upload-repo
+
+          mkdir -p upload-repo/${{ matrix.version }}
+          find upload-repo/${{ matrix.version }} -name '*.tar.bz2' -type f -delete
+
+          found=$(find . -maxdepth 1 -name '*.tar.bz2')
+          if [ -n "$found" ]; then
+            cp $found 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
+          else
+            echo "[WARNING] No .tar.bz2 archive found!"
+            exit 1
+          fi
+
+  build-and-push-docker-images:
+    runs-on: docker-build
+    needs: build-rootfs-archives
 
     steps:
       - name: Checkout code
@@ -20,22 +78,12 @@ jobs:
           IMAGE_ORG=fithwum
           IMAGE_REPO=debian-base
           
-          # Set the tags with new naming convention
-          IMAGE_TAG_BUSTER=buster
-          IMAGE_TAG_BULLSEYE=bullseye
-          IMAGE_TAG_BOOKWORM=bookworm
-          IMAGE_TAG_DOCKER_BUILD=docker-build
+          IMAGE_TAGS=(buster bullseye bookworm docker-build)
 
-          # Set full image names
-          IMAGE_BUSTER=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BUSTER}
-          IMAGE_BULLSEYE=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BULLSEYE}
-          IMAGE_BOOKWORM=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BOOKWORM}
-          IMAGE_DOCKER_BUILD=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_DOCKER_BUILD}
-
-          echo "IMAGE_BUSTER=${IMAGE_BUSTER}" >> $GITHUB_ENV
-          echo "IMAGE_BULLSEYE=${IMAGE_BULLSEYE}" >> $GITHUB_ENV
-          echo "IMAGE_BOOKWORM=${IMAGE_BOOKWORM}" >> $GITHUB_ENV
-          echo "IMAGE_DOCKER_BUILD=${IMAGE_DOCKER_BUILD}" >> $GITHUB_ENV
+          for TAG in "${IMAGE_TAGS[@]}"; do
+            FULL_IMAGE="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${TAG}"
+            echo "IMAGE_${TAG^^}=${FULL_IMAGE}" >> $GITHUB_ENV
+          done
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -43,19 +91,72 @@ jobs:
       - name: Log in to Gitea Registry
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      # Build and Push Docker Images for buster, bullseye, bookworm, docker-build
-      - name: Build and Push buster Docker Image
+      - name: Build and push Docker images
         run: |
-          docker buildx build --platform linux/amd64 --push -t ${IMAGE_BUSTER} ./buster
+          for TAG in buster bullseye bookworm docker-build; do
+            docker buildx build --platform linux/amd64 --push -t "${{ env['IMAGE_' + TAG^^] }}" "./${TAG}"
+          done
 
-      - name: Build and Push bullseye Docker Image
-        run: |
-          docker buildx build --platform linux/amd64 --push -t ${IMAGE_BULLSEYE} ./bullseye
 
-      - name: Build and Push bookworm Docker Image
-        run: |
-          docker buildx build --platform linux/amd64 --push -t ${IMAGE_BOOKWORM} ./bookworm
 
-      - name: Build and Push docker-build Docker Image
-        run: |
-          docker buildx build --platform linux/amd64 --push -t ${IMAGE_DOCKER_BUILD} ./docker-build
\ No newline at end of file
+# name: Build and Push Multi-Arch Docker Images
+
+# on:
+#   push:
+#     branches:
+#       - main
+
+# jobs:
+#   build:
+#     runs-on: docker-build
+
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
+
+#       - name: Set image tags and names
+#         id: vars
+#         run: |
+#           IMAGE_REGISTRY=gitea.fithwum.tech
+#           IMAGE_ORG=fithwum
+#           IMAGE_REPO=debian-base
+          
+#           # Set the tags with new naming convention
+#           IMAGE_TAG_BUSTER=buster
+#           IMAGE_TAG_BULLSEYE=bullseye
+#           IMAGE_TAG_BOOKWORM=bookworm
+#           IMAGE_TAG_DOCKER_BUILD=docker-build
+
+#           # Set full image names
+#           IMAGE_BUSTER=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BUSTER}
+#           IMAGE_BULLSEYE=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BULLSEYE}
+#           IMAGE_BOOKWORM=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BOOKWORM}
+#           IMAGE_DOCKER_BUILD=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_DOCKER_BUILD}
+
+#           echo "IMAGE_BUSTER=${IMAGE_BUSTER}" >> $GITHUB_ENV
+#           echo "IMAGE_BULLSEYE=${IMAGE_BULLSEYE}" >> $GITHUB_ENV
+#           echo "IMAGE_BOOKWORM=${IMAGE_BOOKWORM}" >> $GITHUB_ENV
+#           echo "IMAGE_DOCKER_BUILD=${IMAGE_DOCKER_BUILD}" >> $GITHUB_ENV
+
+#       - name: Set up Docker Buildx
+#         uses: docker/setup-buildx-action@v3
+
+#       - name: Log in to Gitea Registry
+#         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+#       # Build and Push Docker Images for buster, bullseye, bookworm, docker-build
+#       - name: Build and Push buster Docker Image
+#         run: |
+#           docker buildx build --platform linux/amd64 --push -t ${IMAGE_BUSTER} ./buster
+
+#       - name: Build and Push bullseye Docker Image
+#         run: |
+#           docker buildx build --platform linux/amd64 --push -t ${IMAGE_BULLSEYE} ./bullseye
+
+#       - name: Build and Push bookworm Docker Image
+#         run: |
+#           docker buildx build --platform linux/amd64 --push -t ${IMAGE_BOOKWORM} ./bookworm
+
+#       - name: Build and Push docker-build Docker Image
+#         run: |
+#           docker buildx build --platform linux/amd64 --push -t ${IMAGE_DOCKER_BUILD} ./docker-build
\ No newline at end of file