diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index fd24bd178..9c41632a1 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -187,7 +187,7 @@ jobs:
 
       -   name: Build project and run jpackage (x86_64)
           if: matrix.os == 'macos-latest'
-          run: arch -x86_64 ./gradlew clean build jpackageMacX64
+          run: arch -x86_64 ./gradlew jpackageMacX64
 
       # Rename and collect artifacts based on OS
       - name: Prepare artifacts
@@ -200,7 +200,7 @@ jobs:
             mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then
             mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-installer.dmg"
-            mv "./build/jpackage/Stirling-PDF-x86_64-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
+            mv "./build/jpackage/x86_64/Stirling-PDF (x86_64)-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
           else
             mv "./build/jpackage/stirling-pdf_${{ needs.read_versions.outputs.version }}-1_amd64.deb" "./binaries/Stirling-PDF-linux-installer.deb"
           fi
@@ -283,7 +283,7 @@ jobs:
           name: ${{ matrix.platform }}signed
           path: |
             ./Stirling-PDF-${{ matrix.platform }}installer.*
-            ./Stirling-PDF-${{ matrix.platform }}-x86_64-installer.*
+            ./Stirling-PDF-${{ matrix.platform }}x86_64-installer.*
             !cosign.*
 
   create-release:
diff --git a/build.gradle b/build.gradle
index 6523b2c28..c9ffd61f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,14 +164,12 @@ jpackage {
         appVersion = getMacVersion(project.version.toString())
         icon = "src/main/resources/static/favicon.icns"
         type = "dmg"
-        macPackageIdentifier = "com.stirling.software.pdf"
-        macPackageName = "Stirling-PDF-aarch64"
+        macPackageIdentifier = "Stirling-PDF"
+        macPackageName = "Stirling-PDF"
         macAppCategory = "public.app-category.productivity"
         macSign = false // Enable signing
         macAppStore = false // Not targeting App Store initially
-//
-//        //installDir = "Applications"
-//
+
 //        // Add license and other documentation to DMG
 //        /*macDmgContent = [
 //            "README.md",
@@ -252,16 +250,16 @@ tasks.register('jpackageMacX64') {
         def result = exec {
             commandLine 'jpackage',
                     '--type', 'dmg',
-                    '--name', 'Stirling-PDF-x86_64',
+                    '--name', 'Stirling-PDF (x86_64)',
                     '--input', 'build/libs',
                     '--main-jar', "Stirling-PDF-${project.version}.jar",
-                    '--main-class', 'stirling.software.SPDF.SPDFApplication',
+                    '--main-class', 'org.springframework.boot.loader.launch.JarLauncher',
                     '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
-                    '--dest', 'build/jpackage',
+                    '--dest', 'build/jpackage/x86_64',
                     '--icon', 'src/main/resources/static/favicon.icns',
                     '--app-version', getMacVersion(project.version.toString()),
-                    '--mac-package-name', 'Stirling-PDF',
-                    '--mac-package-identifier', 'com.stirling.software.pdf',
+                    '--mac-package-name', 'Stirling-PDF (x86_64)',
+                    '--mac-package-identifier', 'Stirling-PDF (x86_64)',
                     '--mac-app-category', 'public.app-category.productivity'
             standardOutput = outputStream
             errorOutput = errorStream