diff --git a/.forgejo/workflows/dockerindocker-old.yml b/.forgejo/workflows/dockerindocker-old.yml
new file mode 100644
index 0000000..8de2fef
--- /dev/null
+++ b/.forgejo/workflows/dockerindocker-old.yml
@@ -0,0 +1,132 @@
+# Workflow name
+name: Build and Push Docker-in-Docker Container
+
+# Run-name for each workflow run
+run-name: Build and Push Docker-in-Docker Container for ${{ github.ref_name }}
+
+# Triggers for the workflow
+on:
+  # On pushes to the main branch if relevant files change
+  push:
+    branches:
+    - main
+    paths:
+    - 'containers/dockerindocker/**'
+    - '.forgejo/workflows/dockerindocker.yml'
+  # Allows manual triggering from the Forgejo UI
+  workflow_dispatch: {}
+  # Scheduled run every Friday at 8 PM UTC
+  schedule:
+  - cron: '0 20 * * 5'
+
+jobs:
+  build-and-push:
+    # Strategy to build for multiple architectures
+    strategy:
+      matrix:
+        arch: [ amd64, arm64 ]
+    # Use a runner that matches the architecture.
+    # This assumes you have runners tagged with 'amd64' and 'arm64'.
+    runs-on: ${{ matrix.arch }}
+    # Add a Docker-in-Docker service to the job.
+    # This is necessary to build Docker images.
+    # The 'privileged' flag is required for the Docker daemon to run.
+    services:
+      dind:
+        image: docker:dind
+        privileged: true
+    # Set the DOCKER_HOST environment variable to connect to the dind service.
+    env:
+      DOCKER_HOST: tcp://dind:2375
+    steps:
+    # 1. Check out the repository code
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # 2. Wait for the Docker daemon to be ready
+    - name: Wait for Docker to start
+      run: |
+        i=0
+        while ! docker info >/dev/null 2>&1; do
+          i=$((i+1))
+          if [ $i -ge 15 ]; then
+            echo "Docker did not start within 15 seconds"
+            exit 1
+          fi
+          echo "Waiting for Docker to start..."
+          sleep 1
+        done
+
+    # 3. Set up Docker Buildx for multi-platform builds
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    # 4. Login to the Forgejo container registry
+    #    Requires CI_REGISTRY, CI_REGISTRY_USER, and CI_TOKEN secrets to be set in Forgejo.
+    - name: Login to Forgejo Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ secrets.CI_REGISTRY }}
+        username: ${{ secrets.CI_REGISTRY_USER }}
+        password: ${{ secrets.CI_TOKEN }}
+
+    # 5. Build and push the Docker image for the specific architecture
+    - name: Build and push (${{ matrix.arch }})
+      uses: docker/build-push-action@v5
+      with:
+        context: ./containers/dockerindocker/
+        file: ./containers/dockerindocker/Dockerfile
+        platforms: linux/${{ matrix.arch }}
+        push: true
+        tags: |
+          ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:${{ matrix.arch }}-latest
+        # Enable caching to speed up subsequent builds
+        cache-from: type=registry,ref=${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:buildcache-${{ matrix.arch }}
+        cache-to: type=registry,ref=${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:buildcache-${{ matrix.arch }},mode=max
+
+  # This job runs after all 'build-and-push' jobs have succeeded
+  create-manifest:
+    needs: build-and-push
+    # A standard runner is sufficient for creating a manifest
+    runs-on: amd64
+    # Add a Docker-in-Docker service to the job.
+    # This is necessary to create the manifest.
+    # The 'privileged' flag is required for the Docker daemon to run.
+    services:
+      dind:
+        image: docker:dind
+        privileged: true
+    # Set the DOCKER_HOST environment variable to connect to the dind service.
+    env:
+      DOCKER_HOST: tcp://dind:2375
+    steps:
+    # 1. Wait for the Docker daemon to be ready
+    - name: Wait for Docker to start
+      run: |
+        i=0
+        while ! docker info >/dev/null 2>&1; do
+          i=$((i+1))
+          if [ $i -ge 15 ]; then
+            echo "Docker did not start within 15 seconds"
+            exit 1
+          fi
+          echo "Waiting for Docker to start..."
+          sleep 1
+        done
+
+    # 2. Login to the Forgejo container registry again
+    - name: Login to Forgejo Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ secrets.CI_REGISTRY }}
+        username: ${{ secrets.CI_REGISTRY_USER }}
+        password: ${{ secrets.CI_TOKEN }}
+
+    # 3. Create and push the multi-arch manifest
+    #    This combines the amd64 and arm64 images under a single 'latest' tag.
+    - name: Create and push multi-arch manifest
+      run: |
+        docker manifest create ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:latest \
+          --amend ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:amd64-latest \
+          --amend ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:arm64-latest
+        docker manifest push ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:latest
diff --git a/.forgejo/workflows/dockerindocker.yml b/.forgejo/workflows/dockerindocker.yml
index 8de2fef..fed7a36 100644
--- a/.forgejo/workflows/dockerindocker.yml
+++ b/.forgejo/workflows/dockerindocker.yml
@@ -1,78 +1,37 @@
-# Workflow name
-name: Build and Push Docker-in-Docker Container
+name: Docker-in-Docker CI/CD Pipeline
 
-# Run-name for each workflow run
-run-name: Build and Push Docker-in-Docker Container for ${{ github.ref_name }}
-
-# Triggers for the workflow
+run-name: Build, Push, and Publish Multi-Arch Docker-in-Docker for ${{ github.ref_name }}
 on:
-  # On pushes to the main branch if relevant files change
   push:
     branches:
     - main
     paths:
     - 'containers/dockerindocker/**'
     - '.forgejo/workflows/dockerindocker.yml'
-  # Allows manual triggering from the Forgejo UI
   workflow_dispatch: {}
-  # Scheduled run every Friday at 8 PM UTC
   schedule:
   - cron: '0 20 * * 5'
 
 jobs:
   build-and-push:
-    # Strategy to build for multiple architectures
+    name: Build and Push Docker-in-Docker Images
     strategy:
       matrix:
         arch: [ amd64, arm64 ]
-    # Use a runner that matches the architecture.
-    # This assumes you have runners tagged with 'amd64' and 'arm64'.
     runs-on: ${{ matrix.arch }}
-    # Add a Docker-in-Docker service to the job.
-    # This is necessary to build Docker images.
-    # The 'privileged' flag is required for the Docker daemon to run.
-    services:
-      dind:
-        image: docker:dind
-        privileged: true
-    # Set the DOCKER_HOST environment variable to connect to the dind service.
-    env:
-      DOCKER_HOST: tcp://dind:2375
     steps:
-    # 1. Check out the repository code
-    - name: Checkout repository
+    - name: Checkout Source Code
       uses: actions/checkout@v4
-
-    # 2. Wait for the Docker daemon to be ready
-    - name: Wait for Docker to start
-      run: |
-        i=0
-        while ! docker info >/dev/null 2>&1; do
-          i=$((i+1))
-          if [ $i -ge 15 ]; then
-            echo "Docker did not start within 15 seconds"
-            exit 1
-          fi
-          echo "Waiting for Docker to start..."
-          sleep 1
-        done
-
-    # 3. Set up Docker Buildx for multi-platform builds
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    # 4. Login to the Forgejo container registry
-    #    Requires CI_REGISTRY, CI_REGISTRY_USER, and CI_TOKEN secrets to be set in Forgejo.
-    - name: Login to Forgejo Registry
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Login to Forgejo Container Registry
       uses: docker/login-action@v3
       with:
         registry: ${{ secrets.CI_REGISTRY }}
         username: ${{ secrets.CI_REGISTRY_USER }}
         password: ${{ secrets.CI_TOKEN }}
-
-    # 5. Build and push the Docker image for the specific architecture
-    - name: Build and push (${{ matrix.arch }})
-      uses: docker/build-push-action@v5
+    - name: Build and Push Image for ${{ matrix.arch }}
+      uses: docker/build-push-action@v6
       with:
         context: ./containers/dockerindocker/
         file: ./containers/dockerindocker/Dockerfile
@@ -80,28 +39,21 @@ jobs:
         push: true
         tags: |
           ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:${{ matrix.arch }}-latest
-        # Enable caching to speed up subsequent builds
         cache-from: type=registry,ref=${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:buildcache-${{ matrix.arch }}
         cache-to: type=registry,ref=${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:buildcache-${{ matrix.arch }},mode=max
 
-  # This job runs after all 'build-and-push' jobs have succeeded
   create-manifest:
+    name: Create and Publish Multi-Arch Manifest
     needs: build-and-push
-    # A standard runner is sufficient for creating a manifest
     runs-on: amd64
-    # Add a Docker-in-Docker service to the job.
-    # This is necessary to create the manifest.
-    # The 'privileged' flag is required for the Docker daemon to run.
     services:
       dind:
         image: docker:dind
         privileged: true
-    # Set the DOCKER_HOST environment variable to connect to the dind service.
     env:
       DOCKER_HOST: tcp://dind:2375
     steps:
-    # 1. Wait for the Docker daemon to be ready
-    - name: Wait for Docker to start
+    - name: Wait for Docker Daemon
       run: |
         i=0
         while ! docker info >/dev/null 2>&1; do
@@ -113,18 +65,13 @@ jobs:
           echo "Waiting for Docker to start..."
           sleep 1
         done
-
-    # 2. Login to the Forgejo container registry again
-    - name: Login to Forgejo Registry
+    - name: Login to Forgejo Container Registry
       uses: docker/login-action@v3
       with:
         registry: ${{ secrets.CI_REGISTRY }}
         username: ${{ secrets.CI_REGISTRY_USER }}
         password: ${{ secrets.CI_TOKEN }}
-
-    # 3. Create and push the multi-arch manifest
-    #    This combines the amd64 and arm64 images under a single 'latest' tag.
-    - name: Create and push multi-arch manifest
+    - name: Create and Push Multi-Arch Manifest
       run: |
         docker manifest create ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:latest \
           --amend ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:amd64-latest \