diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
index f28b70e..a9ee052 100644
--- a/.gitea/workflows/docker-build.yml
+++ b/.gitea/workflows/docker-build.yml
@@ -11,19 +11,21 @@ jobs:
   build-and-push:
     runs-on: linux
     steps:
-      - name: Login to Container Registry
-        run: |
-          echo "$REGISTRY_TOKEN" | docker login git.kgessner.de -u "$REGISTRY_USER" --password-stdin
-        env:
-          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Build Docker Image
-        run: |
-          docker build -t git.kgessner.de/luiicode/sugar-crm:6.5.26 .
-          docker tag git.kgessner.de/luiicode/sugar-crm:6.5.26 git.kgessner.de/luiicode/sugar-crm:latest
+      - name: Login to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.kgessner.de
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Push to Registry
-        run: |
-          docker push git.kgessner.de/luiicode/sugar-crm:6.5.26
-          docker push git.kgessner.de/luiicode/sugar-crm:latest
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            git.kgessner.de/luiicode/sugar-crm:6.5.26
+            git.kgessner.de/luiicode/sugar-crm:latest