diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index c7346db..2914a0a 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -1,9 +1,9 @@
-name: Build and Deploy
+name: Build, Package and Push Images
 run-name: ${{ gitea.actor }} is building the Server application
 on: [ push ]
 
 jobs:
-  build-server:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -18,7 +18,7 @@ jobs:
           dotnet build Server -c Release
       #         dotnet test Server.Tests -c Release
   sonarqube:
-    needs: build-server
+    needs: build
     runs-on: ubuntu-latest
     if: github.ref_name == 'master'
     steps:
@@ -48,8 +48,8 @@ jobs:
       - name: Sonarqube End
         run: |
           dotnet sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
-  dependency-track:
-    needs: build-server
+  sbom-scan:
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -77,10 +77,10 @@ jobs:
           # set projectversion to be the branch name
           projectVersion: "${{ github.ref_name }}"
           bomFilename: "${{ github.workspace }}/bom.xml"
-  build-push-server-container:
+  container-build:
     runs-on: ubuntu-latest
     container: catthehacker/ubuntu:act-latest
-    needs: build-server
+    needs: build
     steps:
       - uses: actions/checkout@v3
       - name: Setup dotnet
@@ -107,8 +107,8 @@ jobs:
           push: true
           tags: forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }}
           platforms: linux/amd64
-  dependency-track-container:
-    needs: build-push-server-container
+  container-sbom-scan:
+    needs: container-build
     runs-on: ubuntu-latest
     container: catthehacker/ubuntu:act-latest
     steps:
@@ -129,7 +129,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ github.server_url }}
-          username: ${{ secrets.REGISTRY_USERNAME }}
+          username: ${{ github.actor }}
           password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Generate SBOM
         run: |