diff --git a/.github/workflows/deploy_to_development.yml b/.github/workflows/deploy_to_development.yml
index b3e41280..a4598872 100644
--- a/.github/workflows/deploy_to_development.yml
+++ b/.github/workflows/deploy_to_development.yml
@@ -16,6 +16,9 @@ jobs:
       Registry: ghcr.io
       ImageName: ${{ github.repository }}
       Tag: ${{ github.sha }}
+      RegistryUsername: ${{ github.actor }}
+    secrets:
+      RegistryPassword: ${{ secrets.GITHUB_TOKEN }}
 
   deploy:
     name: Update deployment in Development
diff --git a/.github/workflows/deploy_to_staging.yml b/.github/workflows/deploy_to_staging.yml
index 83bebce1..48c4b305 100644
--- a/.github/workflows/deploy_to_staging.yml
+++ b/.github/workflows/deploy_to_staging.yml
@@ -1,4 +1,4 @@
-name: Update deployment in Aurora Dev
+name: Update deployment in Aurora Staging
 
 on:
   release:
@@ -24,6 +24,9 @@ jobs:
       Registry: auroraprodacr.azurecr.io
       ImageName: robotics/flotilla
       Tag: ${{ github.event.release.tag_name }}
+      RegistryUsername: ${{ secrets.ROBOTICS_ACRPUSH_DOCKER_APPLICATION_ID }}
+    secrets:
+      RegistryPassword: ${{ secrets.ROBOTICS_ACRPUSH_DOCKER_SECRET }}
 
   deploy:
     name: Update deployment in Staging
diff --git a/.github/workflows/publish_component.yml b/.github/workflows/publish_component.yml
index 88eaff7b..3d3a9d7d 100644
--- a/.github/workflows/publish_component.yml
+++ b/.github/workflows/publish_component.yml
@@ -15,6 +15,13 @@ on:
       ImageName:
         required: true
         type: string
+      RegistryUsername:
+        required: true
+        type: string
+    secrets:
+      RegistryPassword:
+        required: true
+
 jobs:
   build-and-push-container:
     runs-on: ubuntu-latest
@@ -30,8 +37,8 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ${{ inputs.Registry }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ inputs.RegistryUsername }}
+          password: ${{ secrets.RegistryPassword }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta