diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 104778f4f..2632bd120 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -18,17 +18,26 @@ jobs:
         - {
             name: "Linux",
             os: ubuntu-latest,
-            package: 'tar.gz'
+            arch: 'x86_64',
+            package: 'tar.gz',
+          }
+        - {
+            name: "MacOSX-intel",
+            os: macos-15-intel,
+            arch: 'x86_64',
+            package: 'dmg',
           }
         - {
             name: "MacOSX",
-            os: macos-13,
-            package: 'dmg'
+            os: macos-15,
+            arch: 'arm64',
+            package: 'dmg',
           }
         - {
             name: "Windows",
             os: windows-latest,
-            package: 'msi'
+            arch: 'amd64',
+            package: 'msi',
           }
     defaults:
       run:
@@ -110,7 +119,7 @@ jobs:
     - name: Upload installer package
       uses: actions/upload-artifact@v4
       with:
-        name: HEXRDGUI-v${{env.VERSION}}.${{ matrix.config.package }}
+        name: HEXRDGUI-v${{ env.VERSION }}-${{ matrix.config.arch }}.${{ matrix.config.package }}
         path: ${{ github.workspace }}/hexrdgui/packaging/HEXRDGUI-${{env.VERSION}}.${{ matrix.config.package }}
 
     - name: Upload installer package Zip ( Windows only )
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6db2b2eea..c2eb9f9b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
           }
         - {
             name: "MacOSX",
-            os: macos-13
+            os: macos-15
           }
         - {
             name: "Windows",
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 1f2a511e4..d21f09f56 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -30,7 +30,12 @@ requirements:
     - pyhdf
     # This next one is needed to fix the app name on Mac
     - pyobjc-framework-cocoa  # [osx]
-    - pyside6
+    # Lock the PySide6 version to be less than 6.8 for Mac.
+    # This is because Qt 6.8 has some crashing issue we need
+    # to resolve. This issue is tracked in:
+    # https://github.com/HEXRD/hexrdgui/issues/1931
+    - pyside6<6.8  # [osx]
+    - pyside6  # [not osx]
     - pyyaml
     - silx-base