diff --git a/.github/workflows/base-image.yaml b/.github/workflows/base-image.yaml
index 24b0414f..2ac8bfa3 100644
--- a/.github/workflows/base-image.yaml
+++ b/.github/workflows/base-image.yaml
@@ -24,8 +24,8 @@ jobs:
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: galasa-team
+          password: ${{ secrets.GALASA_TEAM_WRITE_PACKAGES_TOKEN }}
 
       - name: Extract metadata for base image
         id: metadata
diff --git a/.github/workflows/build-automation.yaml b/.github/workflows/build-automation.yaml
index 41a500ad..297d6950 100644
--- a/.github/workflows/build-automation.yaml
+++ b/.github/workflows/build-automation.yaml
@@ -30,8 +30,8 @@ jobs:
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: galasa-team
+          password: ${{ secrets.GALASA_TEAM_WRITE_PACKAGES_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta