diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 56119f5bd..d1f686e3f 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -37,12 +37,12 @@ jobs:
           validate-wrappers: true
           gradle-home-cache-cleanup: true
 
-      - name: Install GMD image for baseline profile generation
-        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
-
       - name: Accept Android licenses
         run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
 
+      - name: Install GMD image for baseline profile generation
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-30;aosp_atd;x86"
+        
       - name: Build release variant including baseline profile generation
         run: ./gradlew :app:assembleDemoRelease
              -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 279c4b226..2687a5735 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -46,10 +46,10 @@ android {
     }
 
     testOptions.managedDevices.devices {
-        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api33") {
-            device = "Pixel 6"
-            apiLevel = 33
-            systemImageSource = "aosp"
+        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4Api30") {
+            device = "Pixel 4"
+            apiLevel = 30
+            systemImageSource = "aosp_atd"
         }
     }
 
@@ -59,7 +59,7 @@ android {
 
 baselineProfile {
     // This specifies the managed devices to use that you run the tests on.
-    managedDevices += "pixel6Api33"
+    managedDevices += "pixel4Api30"
 
     // Don't use a connected device but rely on a GMD for consistency between local and CI builds.
     useConnectedDevices = false