diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 1083b7c..b538c2e 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -12,8 +12,29 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11']
-
+        python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12']
+        exclude:
+          - os: macos-latest
+            python-version: '3.8'
+          - os: macos-latest
+            python-version: 'pypy3.8'
+          - os: macos-latest
+            python-version: '3.9'
+          - os: macos-latest
+            python-version: 'pypy3.9'
+          - os: macos-latest
+            python-version: '3.10'
+        include:
+          - os: macos-13
+            python-version: '3.8'
+          - os: macos-13
+            python-version: 'pypy3.8'
+          - os: macos-13
+            python-version: '3.9'
+          - os: macos-13
+            python-version: 'pypy3.9'
+          - os: macos-13
+            python-version: '3.10'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -21,7 +42,6 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: x64
       - run: pip install -r requirements_ci.txt
       - run: git clone https://github.com/PyCQA/pycodestyle ../pycodestyle
       - run: cd ../pycodestyle && python setup.py build && cd -
diff --git a/Dockerfile b/Dockerfile
index 5af78e5..333b73f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION="3.11"
+ARG PYTHON_VERSION="3.12"
 
 FROM python:${PYTHON_VERSION}