diff --git a/.github/workflows/micronaut-template.yml b/.github/workflows/micronaut-template.yml
index dad5b25e2d7d..618fca9f69ac 100644
--- a/.github/workflows/micronaut-template.yml
+++ b/.github/workflows/micronaut-template.yml
@@ -62,7 +62,7 @@ jobs:
   build-and-test-micronaut:
     name: Native Tests
     needs: build-graalvm
-    runs-on: ubuntu-22.04
+    runs-on: ${{ contains(inputs.NATIVE_IMAGE_OPTIONS || '', '-H:Preserve=all') && 'ubuntu-8core-32gb' || 'ubuntu-22.04' }}
     if: (github.event_name == 'schedule' && github.repository == 'oracle/graal') || (github.event_name != 'schedule')
     steps:
     - name: Checkout oracle/graal
diff --git a/.github/workflows/reachability-metadata-compatibility-preserve-crema.yml b/.github/workflows/reachability-metadata-compatibility-preserve-crema.yml
index 33578b79b0b1..7ca8388e0953 100644
--- a/.github/workflows/reachability-metadata-compatibility-preserve-crema.yml
+++ b/.github/workflows/reachability-metadata-compatibility-preserve-crema.yml
@@ -53,4 +53,4 @@ jobs:
   call-template:
     uses: './.github/workflows/reachability-metadata-template.yml'
     with:
-      NATIVE_IMAGE_OPTIONS: '-H:+UnlockExperimentalVMOptions -H:+ReportExceptionStackTraces -H:+CompatibilityMode -H:Preserve=all -H:+RuntimeClassLoading -H:-UnlockExperimentalVMOptions'
+      NATIVE_IMAGE_OPTIONS: '-H:+UnlockExperimentalVMOptions -H:+ReportExceptionStackTraces -H:+CompatibilityMode -H:Preserve=module=java.base,module=ALL-UNNAMED -H:+RuntimeClassLoading -H:-UnlockExperimentalVMOptions'
diff --git a/.github/workflows/reachability-metadata-template.yml b/.github/workflows/reachability-metadata-template.yml
index 3945b77b14c9..3164d725f74e 100644
--- a/.github/workflows/reachability-metadata-template.yml
+++ b/.github/workflows/reachability-metadata-template.yml
@@ -87,8 +87,8 @@ jobs:
 
   test-all-metadata:
     name: ${{ matrix.coordinates }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
+    runs-on: ${{ contains(inputs.NATIVE_IMAGE_OPTIONS || '', '-H:Preserve=all') && 'ubuntu-8core-32gb' || 'ubuntu-latest' }}
+    timeout-minutes: 45
     needs: [build-graalvm, populate-matrix]
     strategy:
         fail-fast: false
diff --git a/.github/workflows/spring-template.yml b/.github/workflows/spring-template.yml
index d388c2765ebb..b4cf98c8e474 100644
--- a/.github/workflows/spring-template.yml
+++ b/.github/workflows/spring-template.yml
@@ -61,7 +61,8 @@ jobs:
   build-and-test-spring:
     name: Native Tests
     needs: build-graalvm
-    runs-on: ubuntu-22.04
+    timeout-minutes: 60
+    runs-on: ${{ contains(inputs.NATIVE_IMAGE_OPTIONS || '', '-H:Preserve=all') && 'ubuntu-8core-32gb' || 'ubuntu-22.04' }}
     if: (github.event_name == 'schedule' && github.repository == 'oracle/graal') || (github.event_name != 'schedule')
     steps:
     - name: Checkout oracle/graal