diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3cb997a6..2acb6c86d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           ram-size: 4096M
           cores: 4
           force-avd-creation: false
@@ -98,9 +98,10 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           ram-size: 4096M
           cores: 4
-          force-avd-creation: true
+          force-avd-creation: false
           sdcard-path-or-size: 2048M
           disable-animations: true
           emulator-boot-timeout: 1200