diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index e2c17c8..c5c70a9 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -47,16 +47,24 @@ jobs:
           docker buildx inspect --bootstrap
 
       - name: Login to Registry
+        env:
+          REGISTRY_HOSTPORT: ${{ secrets.REGISTRY_HOSTPORT }}
+          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
-          docker login ${{ secrets.REGISTRY_HOSTPORT }} -u ${{ secrets.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }}
+          set -euo pipefail
+          test -n "$REGISTRY_HOSTPORT"
+          echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_HOSTPORT" -u "$REGISTRY_USERNAME" --password-stdin
 
       - name: Build and push
+        env:
+          REGISTRY_HOSTPORT: ${{ secrets.REGISTRY_HOSTPORT }}
         run: |
           docker buildx build --push \
             -f Dockerfile.simple \
             --build-arg SERVICE_NAME=${{ matrix.service }} \
-            -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:${{ gitea.sha }}" \
-            -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-rust-${{ matrix.service }}:high-performance-latest" \
+            -t "$REGISTRY_HOSTPORT/nxtgauge-rust-${{ matrix.service }}:${{ gitea.sha }}" \
+            -t "$REGISTRY_HOSTPORT/nxtgauge-rust-${{ matrix.service }}:high-performance-latest" \
             .
 
   migrate:
@@ -71,13 +79,21 @@ jobs:
           docker buildx inspect --bootstrap
 
       - name: Login to Registry
+        env:
+          REGISTRY_HOSTPORT: ${{ secrets.REGISTRY_HOSTPORT }}
+          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
-          docker login ${{ secrets.REGISTRY_HOSTPORT }} -u ${{ secrets.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }}
+          set -euo pipefail
+          test -n "$REGISTRY_HOSTPORT"
+          echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_HOSTPORT" -u "$REGISTRY_USERNAME" --password-stdin
 
       - name: Build and push migrate
+        env:
+          REGISTRY_HOSTPORT: ${{ secrets.REGISTRY_HOSTPORT }}
         run: |
           docker buildx build --push \
             -f Dockerfile.migrate \
-            -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:${{ gitea.sha }}" \
-            -t "${{ secrets.REGISTRY_HOSTPORT }}/nxtgauge-db-migrate:high-performance-latest" \
+            -t "$REGISTRY_HOSTPORT/nxtgauge-db-migrate:${{ gitea.sha }}" \
+            -t "$REGISTRY_HOSTPORT/nxtgauge-db-migrate:high-performance-latest" \
             .