diff --git a/.github/workflows/NightlyBaselineProfiles.yaml b/.github/workflows/NightlyBaselineProfiles.yaml
index ecb051c45..b72e4ad19 100644
--- a/.github/workflows/NightlyBaselineProfiles.yaml
+++ b/.github/workflows/NightlyBaselineProfiles.yaml
@@ -30,6 +30,12 @@ jobs:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup GMD
+        run: ./gradlew :benchmarks:pixel6Api33Setup
+          --info
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+
       - name: Build all build type and flavor permutations including baseline profiles
         run: ./gradlew :app:assemble
              -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=baselineprofile
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index d298cca10..22249e8d8 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -46,6 +46,12 @@ jobs:
       - name: Setup AVD for GMD use
         run: yes | sdkmanager "system-images;android-33;aosp_atd;x86_64" || true
 
+      - name: Setup GMD
+        run: ./gradlew :benchmarks:pixel6Api33Setup
+          --info
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+
       - name: Build release variant including baseline profile generation
         run: ./gradlew :app:assembleDemoRelease
              -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile