diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32ee69b692..7cbda52501 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,11 @@ include:
 
   # MacOS 64-bit
   - project: 'libretro-infrastructure/ci-templates'
-    file: '/osx-x64.yml'
+    file: '/osx-cmake-x64.yml'
+
+  # MacOS arm64
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-cmake-arm64.yml'
     
   ################################## CELLULAR ################################
   # Android  
@@ -92,7 +96,16 @@ libretro-build-osx-x64:
   tags:
     - macosx-packaging
   extends:
-    - .libretro-osx-x64-make-default
+    - .libretro-osx-cmake-x86_64
+    - .core-defs
+    - .make-defs
+
+# MacOS 64-bit
+libretro-build-osx-arm64:
+  tags:
+    - macosx-packaging
+  extends:
+    - .libretro-osx-cmake-arm64
     - .core-defs
     - .make-defs
 
diff --git a/libretro/CMakeLists.txt b/libretro/CMakeLists.txt
index d04cc155e5..812b9e4f64 100644
--- a/libretro/CMakeLists.txt
+++ b/libretro/CMakeLists.txt
@@ -22,7 +22,7 @@ if(ANDROID)
 endif()
 
 if(NOT MSVC)
-   if (IOS)
+   if (APPLE OR IOS)
    	target_link_libraries(ppsspp_libretro "-Wl")
    else()
    	target_link_libraries(ppsspp_libretro "-Wl,-Bsymbolic")