diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index e3412c3..f6fa90e 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -10,6 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         service:
           - gateway
@@ -39,20 +40,24 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.REGISTRY_HOSTPORT }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: |
-            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ github.sha }}
-            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ github.ref_name }}-latest
+            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.sha }}
+            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.ref }}-latest
           file: Dockerfile.simple
           build-args: |
             SERVICE_NAME=${{ matrix.service }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          insecure: true
 
   migrate:
     runs-on: ubuntu-latest
@@ -63,13 +68,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.REGISTRY_HOSTPORT }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
       - name: Build and push migrate
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: |
-            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ github.sha }}
-            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ github.ref_name }}-latest
+            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.sha }}
+            ${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.ref }}-latest
           file: Dockerfile.migrate
-          insecure: true