diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e8cd13b3..2bf7eaa9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
             api-level: 24
             target: playstore
             arch: x86
-          - os: macos-13
+          - os: macos-15-intel
             api-level: 31
             target: default
             arch: x86_64
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9acefecd..7a0ef4bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v2.36.0
+
+* Remove `--abi` option to better support 16-KB-based system images (#456).
+
+
 ## v2.35.0
 
 * Optimize config.ini updates and efficiency improvements report (#436).
diff --git a/README.md b/README.md
index 7512a75c..8c8c638c 100644
--- a/README.md
+++ b/README.md
@@ -270,5 +270,7 @@ These are some of the open-source projects using (or used) **Android Emulator Ru
 - [bitfireAT/davx5-ose](https://github.com/bitfireAT/davx5-ose/blob/dev-ose/.github/workflows/test-dev.yml)
 - [robolectric/robolectric](https://github.com/robolectric/robolectric/blob/master/.github/workflows/tests.yml)
 - [home-assistant/android](https://github.com/home-assistant/android/blob/master/.github/workflows/pr.yml)
+- [composablehorizons/compose-unstyled](https://github.com/composablehorizons/compose-unstyled/tree/main/.github/workflows)
+- [f3d-app/f3d-android](https://github.com/f3d-app/f3d-android/blob/master/.github/workflows/ci.yml)
 
 If you are using **Android Emulator Runner** and want your project included in the list, please feel free to open a pull request.
diff --git a/lib/emulator-manager.js b/lib/emulator-manager.js
index d57b97e9..1b4da885 100644
--- a/lib/emulator-manager.js
+++ b/lib/emulator-manager.js
@@ -48,7 +48,7 @@ function createAvd(arch, avdName, cores, diskSize, enableHardwareKeyboard, force
                 const profileOption = profile.trim() !== '' ? `--device '${profile}'` : '';
                 const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
                 console.log(`Creating AVD.`);
-                yield exec.exec(`sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --abi '${target}/${arch}' --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`);
+                yield exec.exec(`sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`);
             }
             if (cores || ramSize || heapSize || enableHardwareKeyboard || diskSize) {
                 const configEntries = [];
diff --git a/src/emulator-manager.ts b/src/emulator-manager.ts
index 5a816162..d5f5d7ef 100644
--- a/src/emulator-manager.ts
+++ b/src/emulator-manager.ts
@@ -27,7 +27,7 @@ export async function createAvd(
       const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
       console.log(`Creating AVD.`);
       await exec.exec(
-        `sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --abi '${target}/${arch}' --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`
+        `sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`
       );
     }