diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 9096b5cea..165f7218c 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -47,7 +47,7 @@ jobs:
         run: yes | sdkmanager --licenses || true
 
       - name: Setup AVD for GMD use
-        run: yes | sdkmanager "system-images;android-30;aosp_atd;x86 AOSP ATD Intel x86 Atom System Image" || true
+        run: yes | sdkmanager "system-images;android-33;aosp_atd;x86_64" || true
 
       - name: Check build-logic
         run: ./gradlew check -p build-logic
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 4a1adf1cd..d298cca10 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -39,12 +39,12 @@ jobs:
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
-        
+
       - name: Accept licenses
         run: yes | sdkmanager --licenses || true
 
       - name: Setup AVD for GMD use
-        run: yes | sdkmanager "system-images;android-30;aosp_atd;x86 AOSP ATD Intel x86 Atom System Image" || true
+        run: yes | sdkmanager "system-images;android-33;aosp_atd;x86_64" || true
 
       - name: Build release variant including baseline profile generation
         run: ./gradlew :app:assembleDemoRelease
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 2687a5735..114da1b01 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -46,9 +46,9 @@ android {
     }
 
     testOptions.managedDevices.devices {
-        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4Api30") {
-            device = "Pixel 4"
-            apiLevel = 30
+        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel5Api33") {
+            device = "Pixel 5"
+            apiLevel = 33
             systemImageSource = "aosp_atd"
         }
     }
@@ -59,7 +59,7 @@ android {
 
 baselineProfile {
     // This specifies the managed devices to use that you run the tests on.
-    managedDevices += "pixel4Api30"
+    managedDevices += "pixel5Api33"
 
     // Don't use a connected device but rely on a GMD for consistency between local and CI builds.
     useConnectedDevices = false