diff --git a/.github/workflows/cloud-runner-aws-pipeline.yml b/.github/workflows/cloud-runner-aws-pipeline.yml
index 097beaa0..f1bf011b 100644
--- a/.github/workflows/cloud-runner-aws-pipeline.yml
+++ b/.github/workflows/cloud-runner-aws-pipeline.yml
@@ -4,7 +4,15 @@ on:
   push: { branches: [main, aws, remote-builder/unified-providers] }
 
 env:
-  AWS_REGION: 'eu-west-1'
+  AWS_REGION: eu-west-1
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: eu-west-2
+  GCP_LOG_FILE: ${{ github.workspace }}/cloud-runner-logs.txt
+  AWS_BASE_STACK_NAME: game-ci-github-automation
+  CLOUD_RUNNER_BRANCH: remote-builder/unified-providers
+  CLOUD_RUNNER_TESTS: true
+  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 
 jobs:
   buildForAllPlatforms:
@@ -60,25 +68,12 @@ jobs:
       - run: yarn run test-i-aws
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: eu-west-2
-          DEBUG: true
-          CLOUD_RUNNER_BRANCH: remote-builder/unified-providers
           PROJECT_PATH: ${{ matrix.projectPath }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TARGET_PLATFORM: ${{ matrix.targetPlatform }}
-          AWS_BASE_STACK_NAME: game-ci-github-automation
-          CLOUD_RUNNER_TESTS: true
       - uses: ./
         id: aws-fargate-unity-build
         env:
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: eu-west-2
-          DEBUG: true
-          GCP_LOG_FILE: ${{ github.workspace }}/cloud-runner-logs.txt
         with:
           cloudRunnerCluster: aws
           versioning: None
@@ -86,9 +81,6 @@ jobs:
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          awsBaseStackName: game-ci-github-automation
-          CloudRunnerBranch: remote-builder/unified-providers
-          cloudRunnerTests: true
           postBuildSteps: |
             - name: upload
               image: amazon/aws-cli
diff --git a/.github/workflows/cloud-runner-k8s-pipeline.yml b/.github/workflows/cloud-runner-k8s-pipeline.yml
index ce2b96d3..d13616bd 100644
--- a/.github/workflows/cloud-runner-k8s-pipeline.yml
+++ b/.github/workflows/cloud-runner-k8s-pipeline.yml
@@ -12,7 +12,18 @@ env:
   GKE_REGION: 'us-central1'
   GKE_PROJECT: 'unitykubernetesbuilder'
   GKE_CLUSTER: 'unity-builder-cluster'
-  UNITY_LICENSE: "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>\n    <License id=\"Terms\">\n        <MachineBindings>\n            <Binding Key=\"1\" Value=\"576562626572264761624c65526f7578\"/>\n            <Binding Key=\"2\" Value=\"576562626572264761624c65526f7578\"/>\n        </MachineBindings>\n        <MachineID Value=\"D7nTUnjNAmtsUMcnoyrqkgIbYdM=\"/>\n        <SerialHash Value=\"2033b8ac3e6faa3742ca9f0bfae44d18f2a96b80\"/>\n        <Features>\n            <Feature Value=\"33\"/>\n            <Feature Value=\"1\"/>\n            <Feature Value=\"12\"/>\n            <Feature Value=\"2\"/>\n            <Feature Value=\"24\"/>\n            <Feature Value=\"3\"/>\n            <Feature Value=\"36\"/>\n            <Feature Value=\"17\"/>\n            <Feature Value=\"19\"/>\n            <Feature Value=\"62\"/>\n        </Features>\n        <DeveloperData Value=\"AQAAAEY0LUJHUlgtWEQ0RS1aQ1dWLUM1SlctR0RIQg==\"/>\n        <SerialMasked Value=\"F4-BGRX-XD4E-ZCWV-C5JW-XXXX\"/>\n        <StartDate Value=\"2021-02-08T00:00:00\"/>\n        <UpdateDate Value=\"2021-02-09T00:34:57\"/>\n        <InitialActivationDate Value=\"2021-02-08T00:34:56\"/>\n        <LicenseVersion Value=\"6.x\"/>\n        <ClientProvidedVersion Value=\"2018.4.30f1\"/>\n        <AlwaysOnline Value=\"false\"/>\n        <Entitlements>\n            <Entitlement Ns=\"unity_editor\" Tag=\"UnityPersonal\" Type=\"EDITOR\" ValidTo=\"9999-12-31T00:00:00\"/>\n            <Entitlement Ns=\"unity_editor\" Tag=\"DarkSkin\" Type=\"EDITOR_FEATURE\" ValidTo=\"9999-12-31T00:00:00\"/>\n        </Entitlements>\n    </License>\n<Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><SignedInfo><CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments\"/><SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/><Reference URI=\"#Terms\"><Transforms><Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></Transforms><DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>m0Db8UK+ktnOLJBtHybkfetpcKo=</DigestValue></Reference></SignedInfo><SignatureValue>o/pUbSQAukz7+ZYAWhnA0AJbIlyyCPL7bKVEM2lVqbrXt7cyey+umkCXamuOgsWPVUKBMkXtMH8L\n5etLmD0getWIhTGhzOnDCk+gtIPfL4jMo9tkEuOCROQAXCci23VFscKcrkB+3X6h4wEOtA2APhOY\nB+wvC794o8/82ffjP79aVAi57rp3Wmzx+9pe9yMwoJuljAy2sc2tIMgdQGWVmOGBpQm3JqsidyzI\nJWG2kjnc7pDXK9pwYzXoKiqUqqrut90d+kQqRyv7MSZXR50HFqD/LI69h68b7P8Bjo3bPXOhNXGR\n9YCoemH6EkfCJxp2gIjzjWW+l2Hj2EsFQi8YXw==</SignatureValue></Signature></root>"
+  AWS_REGION: eu-west-1
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: eu-west-2
+  GCP_LOG_FILE: ${{ github.workspace }}/cloud-runner-logs.txt
+  AWS_BASE_STACK_NAME: game-ci-github-automation
+  CLOUD_RUNNER_BRANCH: remote-builder/unified-providers
+  CLOUD_RUNNER_TESTS: true
+  DEBUG: true
+  GCP_LOGGING: true
+  GCP_PROJECT: unitykubernetesbuilder
+  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 
 jobs:
   k8sBuilds:
@@ -50,23 +61,18 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 12.x
+      - run: touch $GCP_LOG_FILE && tail -f $GCP_LOG_FILE | xargs -d '\n' -I{} gcloud logging write game-ci "{}" &
       - run: yarn
       - run: yarn run cli --help
       - name: Cloud Runner Test Suite
         run: yarn run test-i-k8s
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          DEBUG: true
           PROJECT_PATH: ${{ matrix.projectPath }}
           UNITY_VERSION: ${{ matrix.unityVersion }}
           TARGET_PLATFORM: ${{ matrix.targetPlatform }}
           GITHUUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           KUBE_CONFIG: ${{ steps.read-base64.outputs.base64 }}
-          CLOUD_RUNNER_BRANCH: remote-builder/unified-providers
-          GCP_LOGGING: true
-          GCP_PROJECT: unitykubernetesbuilder
-          GCP_LOG_NAME: game-ci
-          CLOUD_RUNNER_TESTS: true
           # Use FUSE to mount a storage bucket to a cache folder
           EXPERIMENTAL_HOOK: |
             - name: FUSE filesystem to s3 for global scale caching
@@ -95,11 +101,6 @@ jobs:
       - name: Cloud Runner Build Test
         uses: ./
         id: k8s-unity-build
-        env:
-          CloudRunnerBranch: remote-builder/unified-providers
-          DEBUG: true
-          GCP_LOG_FILE: ${{ github.workspace }}/cloud-runner-logs
-          INIT_HOOK: touch $GCP_LOG_FILE && tail -f $GCP_LOG_FILE | xargs -d '\n' -I{} gcloud logging write game-ci "{}"
         with:
           cloudRunnerCluster: k8s
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
@@ -109,7 +110,6 @@ jobs:
           projectPath: test-project
           unityVersion: ${{ matrix.targetPlatform }}
           versioning: None
-          cloudRunnerTests: true
           postBuildSteps: |
             - name: upload
               image: amazon/aws-cli