diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 5f72b130..3e7d6082 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -20,12 +20,13 @@ on:
     types:
       - completed
     branches:
+      - "pull-request/[0-9]+"
       - main
       - release-*
 
 jobs:
   e2e-tests:
-    runs-on: pdx01-arc-runners
+    runs-on: linux-amd64-cpu4
     if: ${{ github.event.workflow_run.conclusion == 'success' }} && ${{ github.event.workflow_run.event == 'push' }}
     steps:
       - name: Check out code
@@ -44,7 +45,7 @@ jobs:
           vsphere_username: ${{ secrets.VSPHERE_USERNAME }}
           vsphere_password: ${{ secrets.VSPHERE_PASSWORD }}
           vsphere_ssh_key: ${{ secrets.VSPHERE_SSH_KEY }}
-          holodeck_config: "test/e2e/infra/vsphere.yml"
+          holodeck_config: "test/e2e/infra/aws.yml"
 
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/test/e2e/infra/aws.yml b/test/e2e/infra/aws.yml
new file mode 100644
index 00000000..1c26d1e5
--- /dev/null
+++ b/test/e2e/infra/aws.yml
@@ -0,0 +1,34 @@
+apiVersion: holodeck.nvidia.com/v1alpha1
+kind: Environment
+metadata:
+  name: HOLODECK_NAME
+  description: "end-to-end test infrastructure"
+spec:
+  provider: aws
+  auth:
+    keyName: cnt-ci
+    privateKey: HOLODECK_PRIVATE_KEY
+  instance:
+    type: g6e.xlarge
+    region: us-east-1
+    ingressIpRanges:
+    - 18.190.12.32/32
+    - 3.143.46.93/32
+    - 52.15.119.136/32
+    - 35.155.108.162/32
+    - 35.162.190.51/32
+    - 54.201.61.24/32
+    image:
+      architecture: amd64
+      imageId: ami-0ce2cb35386fc22e9
+  containerRuntime:
+    install: true
+    name: containerd
+  nvidiaContainerToolkit:
+    install: true
+  nvidiaDriver:
+    install: true
+  kubernetes:
+    install: true
+    installer: kubeadm
+    version: v1.30.3
\ No newline at end of file
diff --git a/test/e2e/infra/vsphere.yml b/test/e2e/infra/vsphere.yml
deleted file mode 100644
index 10927ff9..00000000
--- a/test/e2e/infra/vsphere.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: holodeck.nvidia.com/v1alpha1
-kind: Environment
-metadata:
-  name: holodeck-vsphere-e2e-test
-  description: "end-to-end test infrastructure"
-spec:
-  provider: vsphere
-  auth:
-    keyName: cnt-ci
-    privateKey: /home/nvidia/.ssh/gpu_runner
-  VsphereVirtualMachine:
-    vCenterURL: "pdx01egxvc01.nvidia.com"
-    datacenter: "PDX01"
-    datastore: "PDX01EGX_vSAN_001"
-    cluster: "PDX01EGX001"
-    network: "PDX01EGXDVS001_Internal_307_10.185.111.0_24"
-    vmFolder: "GitHub ARC"
-    resoursePool: "CNT-ARC"
-    templateImage: "GPU_UBUNTU_TEMPLATE"
-  containerRuntime:
-    install: true
-    name: containerd
-  nvidiaContainerToolkit:
-    install: true
-  nvidiaDriver:
-    install: true
-  kubernetes:
-    install: true
-    installer: kubeadm
-    version: v1.30.3