diff --git a/.github/workflows/build_and_publish_to_pypi.yml b/.github/workflows/build_and_publish_to_pypi.yml
index 17563534..0e48a48f 100644
--- a/.github/workflows/build_and_publish_to_pypi.yml
+++ b/.github/workflows/build_and_publish_to_pypi.yml
@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install cibuildwheel
         run: |
@@ -70,10 +70,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
     
       - name: Set up dependencies
         uses: carlkidcrypto/os-specific-runner@v2.1.1
diff --git a/.github/workflows/build_and_publish_to_test_pypi.yml b/.github/workflows/build_and_publish_to_test_pypi.yml
index e6fb0ebb..d5194fde 100644
--- a/.github/workflows/build_and_publish_to_test_pypi.yml
+++ b/.github/workflows/build_and_publish_to_test_pypi.yml
@@ -31,16 +31,15 @@ jobs:
     if: needs.check-source-changes.outputs.run_job == 'true'
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, macos-13, macos-14]
+        os: [ubuntu-latest, macos-14, macos-15]
 
     steps:
       - uses: actions/checkout@v4
   
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install cibuildwheel
         run: |
@@ -88,10 +87,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       
       - name: Set up dependencies
         uses: carlkidcrypto/os-specific-runner@v2.1.1
diff --git a/pyproject.toml b/pyproject.toml
index 0591e810..6c746127 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,20 +29,22 @@ repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
 
 [tool.cibuildwheel.macos]
 environment = { PATH = "$HOME/opt/local/bin:$HOME/opt/local/sbin:$HOME/opt/local/include:$HOME/opt/local/lib:$PATH", MACOSX_DEPLOYMENT_TARGET = "15.0", DYLD_LIBRARY_PATH = "$HOME/opt/local/lib:$DYLD_LIBRARY_PATH" }
+archs="x86_64 arm64"
 before-all = """
           mkdir -p $HOME/opt/mports;
           rm -rf $HOME/opt/mports/*;
           cd $HOME/opt/mports;
-          rm -f MacPorts-2.10.5.tar.gz;
-          curl -L https://github.com/macports/macports-base/releases/download/v2.10.5/MacPorts-2.10.5.tar.gz -o MacPorts-2.10.5.tar.gz;
-          tar -xzvf MacPorts-2.10.5.tar.gz;
-          cd $HOME/opt/mports/MacPorts-2.10.5;
+          rm -f MacPorts-2.10.2.tar.gz;
+          curl -L https://github.com/macports/macports-base/releases/download/v2.10.2/MacPorts-2.10.2.tar.gz -o MacPorts-2.10.2.tar.gz;
+          tar -xzvf MacPorts-2.10.2.tar.gz;
+          cd $HOME/opt/mports/MacPorts-2.10.2;
           ./configure --prefix=$HOME/opt/local --with-install-user=`id -un` --with-install-group=`id -gn`;
           make;
           make install;
           make distclean;
           port -N selfupdate;
-          port -N clean net-snmp openssl;
+          port -N clean net-snmp openssl gettext;
+          port -N install gettext;
           port -N install net-snmp openssl;
           port -N upgrade net-snmp openssl;"""
 repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
diff --git a/setup.cfg b/setup.cfg
index c76dd7c8..fc97ad12 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ezsnmp
-version = 2.0.0a3
+version = 2.0.0a4
 description = A blazingly fast and Pythonic SNMP library based on the official Net-SNMP bindings. We use SWIG to generate the wrapper code for us.
 author = Carlos Santos
 author_email = dose.lucky.sake@cloak.id
diff --git a/sphinx_docs_build/source/conf.py b/sphinx_docs_build/source/conf.py
index 54550cc3..417c6683 100644
--- a/sphinx_docs_build/source/conf.py
+++ b/sphinx_docs_build/source/conf.py
@@ -24,7 +24,7 @@
 author = "carlkidcrypto"
 
 # The full version, including alpha/beta/rc tags
-release = "V2.0.0a3"
+release = "V2.0.0a4"
 
 
 # -- General configuration ---------------------------------------------------