diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 9417f4e13..879a6c05f 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1076,7 +1076,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: upload-macos-catalina
-          path: build/strawberry-*-catalina.dmg
+          path: build/strawberry-*-catalina-*.dmg
 
   build-macos-bigsur:
     name: Build macOS Big Sur
@@ -1150,7 +1150,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: upload-macos-bigsur
-          path: build/strawberry-*-bigsur.dmg
+          path: build/strawberry-*-bigsur-*.dmg
 
 
   build-windows:
@@ -1316,7 +1316,7 @@ jobs:
       - name: rsync
         run: |
           set -x
-          for i in $(find uploads -type f -name 'strawberry-*-catalina.dmg'); do
+          for i in $(find uploads -type f -name 'strawberry-*-catalina-*.dmg'); do
             rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/catalina/
           done
 
@@ -1339,6 +1339,6 @@ jobs:
       - name: rsync
         run: |
           set -x
-          for i in $(find uploads -type f -name 'strawberry-*-bigsur.dmg'); do
+          for i in $(find uploads -type f -name 'strawberry-*-bigsur-*.dmg'); do
             rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/bigsur/
           done
diff --git a/cmake/Dmg.cmake b/cmake/Dmg.cmake
index 16d2514b1..f2276f6a6 100644
--- a/cmake/Dmg.cmake
+++ b/cmake/Dmg.cmake
@@ -20,13 +20,13 @@ if(MACDEPLOYQT_EXECUTABLE AND MACOS_VERSION_PACKAGE)
   add_custom_target(dmg
     COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app
     COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
-    COMMAND create-dmg --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}.dmg strawberry.app
+    COMMAND create-dmg --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
   add_custom_target(dmg2
     COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app
     COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
-    COMMAND create-dmg --skip-jenkins --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}.dmg strawberry.app
+    COMMAND create-dmg --skip-jenkins --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${MACOS_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
 endif()