diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 715de95..c738530 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -41,11 +41,21 @@ jobs:
         cmake --build build --target install
     - name: Sign and create dmg
       run: |
-        codesign --force --deep -s - "./output/Jellyfin Desktop.app/"
+        codesign --force --deep -s - "./build/output/Jellyfin Desktop.app/"
         brew install create-dmg
-        create-dmg --volname "Jellyfin Desktop" --no-internet-enable "Jellyfin Desktop.dmg" "./output/Jellyfin Desktop.app"
+        VERSION=$(cat VERSION)
+        ARCH=$(uname -m)
+        DMG_NAME="JellyfinDesktop-${VERSION}-${ARCH}.dmg"
+        create-dmg \
+          --volname "Jellyfin Desktop v${VERSION}" \
+          --no-internet-enable \
+          --window-size 500 300 \
+          --icon-size 100 \
+          --icon "Jellyfin Desktop.app" 125 150 \
+          --app-drop-link 375 150 \
+          "${DMG_NAME}" "./build/output/Jellyfin Desktop.app"
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.artifact }}
-        path: ${{ github.workspace }}/Jellyfin Desktop.dmg
+        path: ${{ github.workspace }}/JellyfinDesktop-*.dmg
diff --git a/CMakeModules/WindowsInstaller.cmake b/CMakeModules/WindowsInstaller.cmake
index 1e5f7ba..06eb011 100644
--- a/CMakeModules/WindowsInstaller.cmake
+++ b/CMakeModules/WindowsInstaller.cmake
@@ -32,9 +32,9 @@ add_custom_target(innosetup_install
 
 # Determine architecture string for output filename
 if(CMAKE_SIZEOF_VOID_P MATCHES 8)
-  set(INSTALLER_ARCH_STR windows-x64)
+  set(INSTALLER_ARCH_STR x64)
 else()
-  set(INSTALLER_ARCH_STR windows-x86)
+  set(INSTALLER_ARCH_STR x86)
 endif()
 
 set(INSTALLER_BASE_NAME "JellyfinDesktop-${VERSION_STRING}-${INSTALLER_ARCH_STR}")