diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
index e038d7033..631f3820c 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
@@ -26,7 +26,7 @@ This document describes all available systems emulators and cores available for
 |Capcom|PlaySystem 2 (cps2)|1993|`cps2`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
 |Capcom|PlaySystem 3 (cps3)|1996|`cps3`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
 |Coleco|ColecoVision (colecovision)|1982|`coleco`|.bin .BIN .col .COL .rom .ROM .zip .ZIP .7z .7Z|**retroarch:** bluemsx (default)<br>**retroarch:** gearcoleco<br>**retroarch:** smsplus<br>|
-|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>|
+|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**amiberry:** amiberry<br>|
 |Commodore|Amiga CD32 (amigacd32)|1994|`amigacd32`|.iso .ISO .cue .CUE .lha .LHA .chd .CHD|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
 |Commodore|C128 (c128)|1985|`c128`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_x128 (default)<br>**vicesa:** x128<br>|
 |Commodore|C16 (c16)|1984|`c16`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_xplus4 (default)<br>**vicesa:** xplus4<br>|
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index 7797d36c4..15a023126 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -123,8 +123,8 @@ makeinstall_target() {
 
   ### Commodore Amiga
   add_emu_core amiga retroarch puae true
-  case ${DEVICE} in
-    RK3566*|RK3399|S922X)
+  case ${TARGET_ARCH} in
+    aarch64)
       add_emu_core amiga amiberry amiberry false
     ;;
   esac