diff --git a/.github/workflows/precompiled.yaml b/.github/workflows/precompiled.yaml
index ddf17633c..13a33735b 100644
--- a/.github/workflows/precompiled.yaml
+++ b/.github/workflows/precompiled.yaml
@@ -342,9 +342,12 @@ jobs:
           driver_branch_json="${{ needs.set-driver-version-matrix.outputs.driver_branch }}"
           DRIVER_BRANCHES=($(echo "$driver_branch_json" | jq -r '.[]'))
           echo "DRIVER_BRANCHES=${DRIVER_BRANCHES[*]}" >> $GITHUB_ENV
-      - name: Set kernel version in holodeck_${{ env.DIST }}.yaml
+      - name: Configure Holodeck e2e test config (kernel, instance)
         run: |
-          yq eval '.spec += {"kernel": {"version": strenv(KERNEL_VERSION)}}' -i tests/holodeck_${{ env.DIST }}.yaml
+          yq eval '.spec += {"kernel": {"version": strenv(KERNEL_VERSION)}}' -i tests/holodeck_ubuntu.yaml
+          if [[ "$DIST" == "ubuntu24.04" ]]; then
+            yq eval '.spec.instance.os = "ubuntu-24.04"' -i tests/holodeck_ubuntu.yaml
+          fi
 
       - name: Set up Holodeck
         uses: NVIDIA/holodeck@v0.2.18
@@ -352,12 +355,11 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SSH_KEY: ${{ secrets.AWS_SSH_KEY }}
-          DIST: ${{ env.DIST }}
         with:
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
-          holodeck_config: "tests/holodeck_${{ env.DIST }}.yaml"
+          holodeck_config: "tests/holodeck_ubuntu.yaml"
       - name: Get public dns name
         id: get_public_dns_name
         uses: mikefarah/yq@master
diff --git a/tests/holodeck_ubuntu22.04.yaml b/tests/holodeck_ubuntu.yaml
similarity index 64%
rename from tests/holodeck_ubuntu22.04.yaml
rename to tests/holodeck_ubuntu.yaml
index 0e870a7da..d4244e718 100644
--- a/tests/holodeck_ubuntu22.04.yaml
+++ b/tests/holodeck_ubuntu.yaml
@@ -11,19 +11,9 @@ spec:
   instance:
     type: g4dn.xlarge
     region: us-west-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
-    - 52.24.205.48/32
-    - 44.235.4.62/32
-    - 44.230.241.223/32
+    os: ubuntu-22.04
     image:
       architecture: amd64
-      imageId: ami-0007a86be89339c9f
   containerRuntime:
     install: true
     name: containerd
diff --git a/tests/holodeck_ubuntu24.04.yaml b/tests/holodeck_ubuntu24.04.yaml
deleted file mode 100644
index 7e22a2361..000000000
--- a/tests/holodeck_ubuntu24.04.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-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: g4dn.xlarge
-    region: us-west-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
-    - 52.24.205.48/32
-    - 44.235.4.62/32
-    - 44.230.241.223/32
-    image:
-      architecture: amd64
-      imageId: ami-00271c85bf8a52b84
-  containerRuntime:
-    install: true
-    name: containerd
-  kubernetes:
-    install: true
-    installer: kubeadm
-    version: v1.33.0
-    crictlVersion: v1.33.0