diff --git a/.github/workflows/baseline-profile.yml b/.github/workflows/baseline-profile.yml
index ddda0e91..a6d09220 100644
--- a/.github/workflows/baseline-profile.yml
+++ b/.github/workflows/baseline-profile.yml
@@ -58,7 +58,7 @@ jobs:
 
     - name: Run benchmark on Gradle Managed Device
       run: |
-        ./gradlew api31BenchmarkAndroidTest \
+        ./gradlew baselineprofileBenchmarkAndroidTest \
           -Dorg.gradle.workers.max=1 \
           -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile \
           -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
@@ -71,7 +71,7 @@ jobs:
         # Pull down any changes which may have been committed while this workflow has been running
         git pull
         # Sort the baseline profile, output to android/
-        sort -o android/src/main/baseline-prof.txt benchmark/build/outputs/managed_device_android_test_additional_output/benchmark/api31/BaselineProfileGenerator_generateBaselineProfile-baseline-prof.txt
+        sort -o android/src/main/baseline-prof.txt benchmark/build/outputs/managed_device_android_test_additional_output/benchmark/baselineprofile/BaselineProfileGenerator_generateBaselineProfile-baseline-prof.txt
         # If the baseline profile has changed, commit it
         if [[ $(git diff --stat android/src/main/baseline-prof.txt) != '' ]]; then
           git add android/src/main/baseline-prof.txt
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index 6a12cadb..b0bd6daf 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -33,10 +33,10 @@ android {
   testOptions {
     managedDevices {
       devices {
-        create<ManagedVirtualDevice>("api31") {
-          device = "Pixel 6"
-          apiLevel = 31
-          systemImageSource = "aosp"
+        create<ManagedVirtualDevice>("baselineprofile") {
+          device = "Pixel 5"
+          apiLevel = 33
+          systemImageSource = "google_apis"
         }
       }
     }