diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index a8e82aa..41e5c82 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,4 +1,5 @@
 name: Build and Push Docker Container
+
 on:
   schedule:
     - cron: "0 11 * * 5"
@@ -18,29 +19,32 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      # --- Logins ---
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.DOCKER_REGISTRY_URL }}
+          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.ACTION_ACCESS_TOKEN }}
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # Change to Brache archlinux
-      - uses: actions/checkout@v4
-        with:
-          ref: archlinux
+      - name: Repo owner to lowercase (for Gitea namespace)
+        run: echo "REPO_OWNER_LC=$(echo '${{ gitea.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
-      - name: Build and push Docker image for latest tag
-        uses: docker/build-push-action@v5
+      # ---------------- BRANCH BUILD (main) ----------------
+      # On Branch: Gitea and Docker Hub :latest
+      - name: Build & push (branch -> only :latest everywhere)
+        if: ${{ github.ref_type == 'branch' && github.ref == 'refs/heads/main' }}
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          tags: daniel156161/borgbackup-ssh:latest
-          platforms: linux/amd64
-
-      - name: Build and push Docker image for archlinux tag
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: daniel156161/borgbackup-ssh:archlinux
           platforms: linux/amd64
+          tags: |
+            ${{ vars.DOCKER_REGISTRY_URL }}/${{ env.REPO_OWNER_LC }}/borgbackup-ssh:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/borgbackup-ssh:latest