diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2f373fd0536..04788420fa8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -312,16 +312,7 @@ jobs:
 
       - name: Prepare - Install tools
         run: |
-          brew install automake autoconf-archive cmake libtool ninja
-
-      # libcxx build is not working with python >= 3.12
-      - name: Do not use preinstalled python >= 3.12
-        run: |
-          brew uninstall --ignore-dependencies python@3.12
-          [ -e /Library/Frameworks/Python.framework ] && \
-            sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this
-          brew install python@3.11
-          ln -s "$(brew --prefix python@3.11)/bin/python3" "$(brew --prefix python@3.11)/bin/python"
+          brew install automake autoconf-archive cmake libtool ninja python-setuptools
 
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v7
diff --git a/builds/install/arch-specific/darwin/Distribution.xml b/builds/install/arch-specific/darwin/Distribution-arm64.xml
similarity index 95%
rename from builds/install/arch-specific/darwin/Distribution.xml
rename to builds/install/arch-specific/darwin/Distribution-arm64.xml
index e5471e3686b..0273de78a3b 100644
--- a/builds/install/arch-specific/darwin/Distribution.xml
+++ b/builds/install/arch-specific/darwin/Distribution-arm64.xml
@@ -5,6 +5,7 @@
     <license file="License.txt" mime-type="text/plain"/>
     <readme file="Readme.txt" mime-type="text/plain"/>
     <pkg-ref id="com.firebirdsql.Firebird"/>
+	<options hostArchitectures="arm64"/>
     <options customize="never" require-scripts="false"/>
     <choices-outline>
         <line choice="default">
diff --git a/builds/install/arch-specific/darwin/DistributionCS.xml b/builds/install/arch-specific/darwin/Distribution-x64.xml
similarity index 72%
rename from builds/install/arch-specific/darwin/DistributionCS.xml
rename to builds/install/arch-specific/darwin/Distribution-x64.xml
index fd9498fb22e..fde9807ae0d 100644
--- a/builds/install/arch-specific/darwin/DistributionCS.xml
+++ b/builds/install/arch-specific/darwin/Distribution-x64.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
-    <title>Firebird Database Server (Classic)</title>
+    <title>Firebird Database Server</title>
     <welcome file="Welcome.txt" mime-type="text/plain"/>
     <license file="License.txt" mime-type="text/plain"/>
+    <readme file="Readme.txt" mime-type="text/plain"/>
     <pkg-ref id="com.firebirdsql.Firebird"/>
+	<options hostArchitectures="x86_64"/>
     <options customize="never" require-scripts="false"/>
     <choices-outline>
         <line choice="default">
@@ -14,5 +16,5 @@
     <choice id="com.firebirdsql.Firebird" visible="false">
         <pkg-ref id="com.firebirdsql.Firebird"/>
     </choice>
-    <pkg-ref id="com.firebirdsql.Firebird" version="2.5.0" onConclusion="none">FirebirdCS.pkg</pkg-ref>
+    <pkg-ref id="com.firebirdsql.Firebird" version="4.0.0" onConclusion="none">Firebird.pkg</pkg-ref>
 </installer-gui-script>
diff --git a/builds/install/arch-specific/darwin/DistributionSS.xml b/builds/install/arch-specific/darwin/DistributionSS.xml
deleted file mode 100644
index b33d511cd62..00000000000
--- a/builds/install/arch-specific/darwin/DistributionSS.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<installer-gui-script minSpecVersion="1">
-    <title>Firebird Database Server (SuperServer)</title>
-    <welcome file="Welcome.txt" mime-type="text/plain"/>
-    <license file="License.txt" mime-type="text/plain"/>
-    <pkg-ref id="com.firebirdsql.Firebird"/>
-    <options customize="never" require-scripts="false"/>
-    <choices-outline>
-        <line choice="default">
-            <line choice="com.firebirdsql.Firebird"/>
-        </line>
-    </choices-outline>
-    <choice id="default"/>
-    <choice id="com.firebirdsql.Firebird" visible="false">
-        <pkg-ref id="com.firebirdsql.Firebird"/>
-    </choice>
-    <pkg-ref id="com.firebirdsql.Firebird" version="2.5.0" onConclusion="none">FirebirdSS.pkg</pkg-ref>
-</installer-gui-script>
diff --git a/builds/install/arch-specific/darwin/Makefile.in b/builds/install/arch-specific/darwin/Makefile.in
index 2ea830f9ba6..fad4c7f3093 100644
--- a/builds/install/arch-specific/darwin/Makefile.in
+++ b/builds/install/arch-specific/darwin/Makefile.in
@@ -58,7 +58,7 @@ package_firebird:
 			$(ROOT)/gen/$(TARGET)/resources/Readme.txt
 	cp ../builds/install/arch-specific/darwin/License.txt \
 			$(ROOT)/gen/$(TARGET)/resources/License.txt
-	cp ../builds/install/arch-specific/darwin/Distribution.xml \
+	cp ../builds/install/arch-specific/darwin/Distribution-$(CpuType).xml \
 			$(ROOT)/gen/$(TARGET)/Distribution.xml
 
 	rm -fr $(TARGET)/packages
diff --git a/configure.ac b/configure.ac
index 35f932a72dd..1d8a2e280a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ if test "x$VCPKG_TRIPLET" != "x" ; then
     ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
   fi
 
-  ./vcpkg/vcpkg install --triplet=$VCPKG_TRIPLET --debug
+  ./vcpkg/vcpkg install --triplet=$VCPKG_TRIPLET
 
   VCPKG_INSTALLED=`pwd`/vcpkg_installed/$VCPKG_TRIPLET
   AC_SUBST(VCPKG_INSTALLED)