diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml
index 776a6fa..d0a03bc 100644
--- a/.gitea/workflows/builder.yaml
+++ b/.gitea/workflows/builder.yaml
@@ -13,39 +13,38 @@ jobs:
       - uses: actions/checkout@v3
         name: Check out code
 
-      - uses: mr-smithers-excellent/docker-build-push@v6
-        name: Build futureporn/tracker-helper
+      - name: Login to Gitea Docker Registry
+        uses: docker/login-action@v3
         with:
-          image: futureporn/tracker-helper
-          tags: latest
           registry: gitea.futureporn.net
-          directory: ./services/tracker-helper
-          dockerfile: Dockerfile
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build futureporn/tracker-helper
+        uses: docker/build-push-action@v6
+        with:
+          context: ./services/tracker-helper
+          push: true
+          tags: gitea.futureporn.net/futureporn/tracker-helper:latest
+          secrets: |
+            WL_CREDENTIALS=${{ secrets.WL_CREDENTIALS }}
         env:
           WL_CREDENTIALS: ${{ secrets.WL_CREDENTIALS }}
           WL_FIFO_PATH: /tmp/adder.fifo
           WL_FILE_PATH: /usr/src/app/test/fixtures/whitelist
 
-      - uses: mr-smithers-excellent/docker-build-push@v6
-        name: Build futureporn/opentracker
+      - name: Build futureporn/opentracker
+        uses: docker/build-push-action@v6
         with:
-          image: futureporn/opentracker
-          tags: latest
-          registry: gitea.futureporn.net
-          directory: ./apps/opentracker
-          dockerfile: Dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          context: ./apps/opentracker
+          push: true
+          tags: gitea.futureporn.net/futureporn/opentracker:latest
 
-      - uses: mr-smithers-excellent/docker-build-push@v6
-        name: Build futureporn/bright
+      - name: Build futureporn/bright
+        uses: docker/build-push-action@v6
         with:
-          image: futureporn/bright
-          tags: latest
-          registry: gitea.futureporn.net
-          dockerfile: dockerfiles/bright.dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          buildArgs: MIX_ENV=prod
+          context: ./apps/bright
+          push: true
+          tags: gitea.futureporn.net/futureporn/bright:latest
+          build-args: |
+            MIX_ENV=prod