diff --git a/.github/workflows/shared-build-deploy-container.yml b/.github/workflows/shared-build-deploy-container.yml
index 74fd26c8..eabf6597 100644
--- a/.github/workflows/shared-build-deploy-container.yml
+++ b/.github/workflows/shared-build-deploy-container.yml
@@ -54,7 +54,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       environment: ${{ steps.load-environment.outputs.environment }}
-      runnerName: ${{ steps.load-environment.outputs.runnerName }}
       tagPrefix: ${{ steps.load-environment.outputs.tagPrefix }}
     steps:
       - name: Checkout calling repo
@@ -67,7 +66,7 @@ jobs:
           path: ./github-actions-shared-build-deploy-container
           ref: ${{ inputs.actionsRepoRef }}
 
-      - name: Load environment and runner
+      - name: Load environment
         id: load-environment
         uses: ./github-actions-shared-build-deploy-container/load-environment
 
@@ -98,7 +97,7 @@ jobs:
   build-push-container-image:
     name: "Build and push container image"
     needs: [ prepare-and-validate ]
-    runs-on: ${{ needs.prepare-and-validate.outputs.runnerName }}
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout calling repo
         uses: actions/checkout@v4
@@ -135,7 +134,7 @@ jobs:
   deploy-kubernetes:
     name: "Deploy image to Kubernetes"
     needs: [ prepare-and-validate, build-push-container-image ]
-    runs-on: ${{ needs.prepare-and-validate.outputs.runnerName }}
+    runs-on: ubuntu-latest
     if: |
       always() &&
         (needs.build-push-container-image.result == 'success' || (needs.build-push-container-image.result == 'skipped'
diff --git a/.github/workflows/shared-deploy-container-kubernetes.yml b/.github/workflows/shared-deploy-container-kubernetes.yml
index e18031be..1caaa38d 100644
--- a/.github/workflows/shared-deploy-container-kubernetes.yml
+++ b/.github/workflows/shared-deploy-container-kubernetes.yml
@@ -40,7 +40,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       environment: ${{ steps.load-environment.outputs.environment }}
-      runnerName: ${{ steps.load-environment.outputs.runnerName }}
     steps:
       - name: Checkout calling repo
         uses: actions/checkout@v4
@@ -52,26 +51,20 @@ jobs:
           path: ./github-actions-shared-deploy-image
           ref: ${{ inputs.actionsRepoRef }}
 
-      - name: "Detect Environment and Runner"
+      - name: "Detect Environment"
         shell: bash
         id: load-environment
         run: |
           if [[ "${{ inputs.environment }}" == "prod" ]]; then
               DETECTED_ENVIRONMENT="production"
-              RUNNER_NAME="prod-trakx-runner"
           elif [[ "${{ inputs.environment }}" == "stage" ]]; then
               DETECTED_ENVIRONMENT="staging"
-              RUNNER_NAME="stage-trakx-runner"
           else
               DETECTED_ENVIRONMENT="development"
-              RUNNER_NAME="dev-trakx-runner"
           fi
           
           echo "Detected Environment is: $DETECTED_ENVIRONMENT"
-          echo "Detected Runner is: $RUNNER_NAME"
-          
           echo "environment=$DETECTED_ENVIRONMENT" >> $GITHUB_OUTPUT
-          echo "runnerName=$RUNNER_NAME" >> $GITHUB_OUTPUT
 
       - name: Outputs if this is a workflow_dispatch for production (manual deploy)
         shell: bash
@@ -100,7 +93,7 @@ jobs:
   deploy-kubernetes:
     name: "Deploy image to Kubernetes"
     needs: [ prepare-and-validate ]
-    runs-on: ${{ needs.prepare-and-validate.outputs.runnerName }}
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout calling repo
         uses: actions/checkout@v4