diff --git a/.gitea/workflows/docker-builder.yml b/.gitea/workflows/docker-builder.yml
index 29da46a..7f670e0 100644
--- a/.gitea/workflows/docker-builder.yml
+++ b/.gitea/workflows/docker-builder.yml
@@ -1,9 +1,9 @@
-name: Docker Build Multi-Branch
+name: Docker Build Smart Logic
 
 on:
   push:
     branches:
-      - '**' 
+      - '**'
   workflow_dispatch:
 
 env:
@@ -19,19 +19,31 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set dynamic variables
+      - name: Set dynamic variables and check Dockerfiles
         run: |
-          # Nutzt die Gitea-Variable für den Branch-Namen (z.B. 3.23 oder main)
+          # 1. Basis-Checks
+          if [ ! -f "Dockerfile" ]; then
+            echo "ERROR: No Dockerfile found! Aborting."
+            exit 1
+          fi
+
+          # 2. Architektur-Zuweisung
+          AMD64_FILE="Dockerfile"
+          if [ -f "Dockerfile.aarch64" ]; then
+            echo "Custom Dockerfile.aarch64 detected."
+            ARM64_FILE="Dockerfile.aarch64"
+          else
+            echo "No Dockerfile.aarch64 found. Using standard Dockerfile for both architectures."
+            ARM64_FILE="Dockerfile"
+          fi
+
+          # 3. Variablen exportieren
           VERSION="${{ gitea.ref_name }}"
-          
-          # Pfade zusammenbauen
-          FULL_IMAGE_NAME="${{ env.REGISTRY_HOST }}/${{ env.IMAGE_BASE }}"
-          CACHE_IMAGE_NAME="${{ env.REGISTRY_HOST }}/${{ env.IMAGE_BASE }}-cache"
-          
-          # Variablen für nachfolgende Schritte speichern
           echo "VERSION=$VERSION" >> $GITEA_ENV
-          echo "IMAGE_NAME=$FULL_IMAGE_NAME" >> $GITEA_ENV
-          echo "CACHE_IMAGE_NAME=$CACHE_IMAGE_NAME" >> $GITEA_ENV
+          echo "IMAGE_NAME=${{ env.REGISTRY_HOST }}/${{ env.IMAGE_BASE }}" >> $GITEA_ENV
+          echo "CACHE_IMAGE_NAME=${{ env.REGISTRY_HOST }}/${{ env.IMAGE_BASE }}-cache" >> $GITEA_ENV
+          echo "AMD64_DOCKERFILE=$AMD64_FILE" >> $GITEA_ENV
+          echo "ARM64_DOCKERFILE=$ARM64_FILE" >> $GITEA_ENV
           echo "BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITEA_ENV
 
       - name: Login to registry
@@ -51,7 +63,7 @@ jobs:
         run: |
           docker buildx build \
             --platform linux/amd64 \
-            -f Dockerfile \
+            -f ${AMD64_DOCKERFILE} \
             --build-arg BUILD_DATE=${BUILD_DATE} \
             --build-arg VERSION=${VERSION} \
             -t ${CACHE_IMAGE_NAME}:${VERSION}-amd64 \
@@ -61,7 +73,7 @@ jobs:
         run: |
           docker buildx build \
             --platform linux/arm64 \
-            -f Dockerfile.aarch64 \
+            -f ${ARM64_DOCKERFILE} \
             --build-arg BUILD_DATE=${BUILD_DATE} \
             --build-arg VERSION=${VERSION} \
             -t ${CACHE_IMAGE_NAME}:${VERSION}-arm64 \