diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 76b66f627..9c2ea88a0 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -16,6 +16,7 @@ on:
 
 jobs:
   docker-build:
+    runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
       matrix:
@@ -26,12 +27,21 @@ jobs:
             dockerfile: docker/Backend.Dockerfile
           - app_name: rag-webapp
             dockerfile: docker/Frontend.Dockerfile
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      registry: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic.azurecr.io' || 'cwydcontainerreg.azurecr.io'}}
-      username: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic' || 'cwydcontainerreg'}}
-      app_name: ${{ matrix.app_name }}
-      dockerfile: ${{ matrix.dockerfile }}
-      branch: ${{ github.event.workflow_run.head_branch }}
-      push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
-    secrets: inherit
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
+
+      - name: Build Docker Image
+        uses: ./.github/workflows/build-docker.yml
+        with:
+          registry: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic.azurecr.io' || 'cwydcontainerreg.azurecr.io'}}
+          username: ${{ github.event.workflow_run.head_branch == 'main' && 'fruoccopublic' || 'cwydcontainerreg'}}
+          app_name: ${{ matrix.app_name }}
+          dockerfile: ${{ matrix.dockerfile }}
+          branch: ${{ github.event.workflow_run.head_branch }}
+          push: ${{ github.event_name == 'workflow_run' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'dev' || github.event.workflow_run.head_branch == 'demo') }}
+        env:
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DEV_DOCKER_PASSWORD: ${{ secrets.DEV_DOCKER_PASSWORD }}
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 1014938df..7735eeab7 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -21,11 +21,6 @@ on:
       push:
         required: true
         type: boolean
-    secrets:
-      DOCKER_PASSWORD:
-        required: false
-      DEV_DOCKER_PASSWORD:
-        required: false
 
 jobs:
   docker-build:
@@ -39,7 +34,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: ${{ github.event.workflow_run.head_branch }}
+        ref: ${{ inputs.branch }}
 
     - name: Docker Login
       if: ${{ inputs.push == true && inputs.branch == 'main' }}
@@ -47,7 +42,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        password: ${{ env.DOCKER_PASSWORD }}
 
     - name: Dev Docker Login
       if: ${{ inputs.push == true && (inputs.branch == 'dev' || inputs.branch == 'demo') }}
@@ -55,7 +50,7 @@ jobs:
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ secrets.DEV_DOCKER_PASSWORD }}
+        password: ${{ env.DEV_DOCKER_PASSWORD }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3