From c686525002f866adec1c6366fbf27bd2c1bd0c13 Mon Sep 17 00:00:00 2001
From: Douglas Winter <douglas.winter@diamond.ac.uk>
Date: Thu, 5 Feb 2026 10:10:07 +0000
Subject: [PATCH 1/2] Fix credentials for GHCR

---
 .github/workflows/release_web_app.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release_web_app.yml b/.github/workflows/release_web_app.yml
index 7c52153..cf8c6af 100644
--- a/.github/workflows/release_web_app.yml
+++ b/.github/workflows/release_web_app.yml
@@ -62,9 +62,9 @@ jobs:
       - name: Log in to GHCR
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -89,13 +89,14 @@ jobs:
       - name: Install Helm
         uses: azure/setup-helm@v4
         with:
+          token: ${{ secrets.GITHUB_TOKEN }}
           version: v3.14.0
 
       - name: Log in to GHCR (Helm OCI)
         run: |
-          echo "${{ secrets.GHCR_PAT }}" | \
+          echo ${{ secrets.GITHUB_TOKEN }} | \
             helm registry login ghcr.io \
-              --username ${{ github.actor }} \
+              --username ${{ github.repository_ownder }} \
               --password-stdin
 
       - name: Sync versions in Chart and Values

From 58cef76cf53be0e12555e8c22114f7b3ac5d80d6 Mon Sep 17 00:00:00 2001
From: Douglas Winter <douglas.winter@diamond.ac.uk>
Date: Thu, 5 Feb 2026 10:39:40 +0000
Subject: [PATCH 2/2] Lowercase repo

---
 .github/workflows/release_web_app.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release_web_app.yml b/.github/workflows/release_web_app.yml
index cf8c6af..b4dccfd 100644
--- a/.github/workflows/release_web_app.yml
+++ b/.github/workflows/release_web_app.yml
@@ -66,6 +66,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Normalise repository name to lowercase
+        id: repo
+        run: |
+          echo "repo_lc=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
@@ -75,8 +80,8 @@ jobs:
           build-args: |
             APP_NAME=${{ needs.parse-tag.outputs.app }}
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ needs.parse-tag.outputs.app }}:${{ needs.parse-tag.outputs.version }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ needs.parse-tag.outputs.app }}:latest
+            ${{ env.REGISTRY }}/${{ steps.repo.outputs.repo_lc }}/${{ needs.parse-tag.outputs.app }}:${{ needs.parse-tag.outputs.version }}
+            ${{ env.REGISTRY }}/${{ steps.repo.outputs.repo_lc }}/${{ needs.parse-tag.outputs.app }}:latest
 
   helm:
     name: Package & Push Helm chart
@@ -96,9 +101,14 @@ jobs:
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | \
             helm registry login ghcr.io \
-              --username ${{ github.repository_ownder }} \
+              --username ${{ github.repository_owner }} \
               --password-stdin
 
+      - name: Normalise repository name to lowercase
+        id: repo
+        run: |
+          echo "repo_lc=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+
       - name: Sync versions in Chart and Values
         run: |
           CHART_DIR="apps/${{ needs.parse-tag.outputs.app }}/helm"
@@ -131,4 +141,4 @@ jobs:
           CHART_PACKAGE=$(ls *.tgz)
 
           helm push "$CHART_PACKAGE" \
-            oci://${{ env.REGISTRY }}/${{ github.repository }}/charts
+            oci://${{ env.REGISTRY }}/${{ steps.repo.outputs.repo_lc }}/charts