diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6d0bf6ff..54a75da0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -148,7 +148,7 @@ jobs:
             library: ILGPU.Algorithms
             framework: net471
       fail-fast: false
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ contains(matrix.os, 'cuda') && format('{0}-{1}-{2}', matrix.os, matrix.library, matrix.framework) || matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/runners.yaml b/.github/workflows/runners.yaml
index 9a223c720..2c06e3ed6 100644
--- a/.github/workflows/runners.yaml
+++ b/.github/workflows/runners.yaml
@@ -81,10 +81,9 @@ jobs:
         env:
           APP_ID: ${{ secrets.APP_ID }}
           APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
-          GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
-          GOOGLE_PROJECT: ${{ secrets.GOOGLE_PROJECT }}
-          GOOGLE_REGION: ${{ secrets.GOOGLE_REGION }}
-          GOOGLE_ZONE: ${{ secrets.GOOGLE_ZONE }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
           PULUMI_BACKEND_URL: ${{ secrets.PULUMI_BACKEND_URL }}
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
           PULUMI_SKIP_CONFIRMATIONS: "true"
@@ -95,9 +94,10 @@ jobs:
           REPO: ${{ github.event.repository.name }}
         working-directory: pulumi
         run: |
+          cd aws
           case ${{ github.event.inputs.action }} in
             'requested')
-              cp ../ilgpu/.github/workflows/runners/config.yaml Pulumi.$PULUMI_STACK_NAME.yaml
+              cp ../../ilgpu/.github/workflows/runners/config.yaml Pulumi.$PULUMI_STACK_NAME.yaml
               pulumi stack init $PULUMI_STACK_NAME
               pulumi config set labels $LABEL
               pulumi config set owner $OWNER
diff --git a/.github/workflows/runners/config.yaml b/.github/workflows/runners/config.yaml
index df841b727..871ef6c7d 100644
--- a/.github/workflows/runners/config.yaml
+++ b/.github/workflows/runners/config.yaml
@@ -1,6 +1,6 @@
 config:
-  ephemeral-github-runner-gcp:bootDiskSizeInGB: "100"
-  ephemeral-github-runner-gcp:bootDiskType: pd-balanced
-  ephemeral-github-runner-gcp:machineImage: ubuntu-2004-focal-v20220419-ghr22940-nv510
-  ephemeral-github-runner-gcp:machineType: a2-highgpu-1g
-  ephemeral-github-runner-gcp:runnersCount: "1"
\ No newline at end of file
+  ephemeral-github-runner:bootDiskSizeInGB: "100"
+  ephemeral-github-runner:bootDiskType: gp2
+  ephemeral-github-runner:machineImage: ubuntu-focal-2004-amd64-server-20211129-ghr22940-nv510
+  ephemeral-github-runner:machineType: g4dn.xlarge
+  ephemeral-github-runner:runnersCount: "1"
\ No newline at end of file