diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b7295218..f87194b2c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,7 +97,7 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
+        name: artifact-sdist
         path: dist/*.tar.gz
 
   upload_to_test_pypy:
@@ -106,7 +106,7 @@ jobs:
     steps:
     - uses: actions/download-artifact@v4
       with:
-        name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
+        merge-multiple: true
         path: dist
 
     - uses: pypa/gh-action-pypi-publish@v1.12.4
@@ -123,7 +123,7 @@ jobs:
     steps:
     - uses: actions/download-artifact@v4
       with:
-        name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
+        merge-multiple: true
         path: dist
 
     - uses: pypa/gh-action-pypi-publish@v1.12.4
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ad83bd740..8d1ab246a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -92,7 +92,8 @@ jobs:
     displayName: 'Download and Extract KLayout bits'
 
   - script: |
-      python -m pip install --upgrade pip setuptools wheel
+      # setuptools 67.0.0 is not working as of now (pypa/setuptools#4885)
+      python -m pip install --upgrade pip "setuptools<76.0.0" wheel
     displayName: 'Update pip, setuptools and wheel'
 
   - script: |
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index c1084a66b..3be1c22de 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -192,7 +192,7 @@ RubySequoia      = { 'exe':  '/System/Library/Frameworks/Ruby.framework/Versions
 #  install with 'sudo port install ruby33'
 # [Key Type Name] = 'MP33'
 Ruby33MacPorts  = { 'exe': '/opt/local/bin/ruby3.3',
-                    'inc': '/opt/local/include/ruby-3.3.6',
+                    'inc': '/opt/local/include/ruby-3.3.7',
                     'lib': '/opt/local/lib/libruby.3.3.dylib'
                   }