diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 40595e4..755912b 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -21,11 +21,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools twine
+          python -m pip install setuptools wheel twine
       - name: Build and publish
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          python setup.py sdist
+          python setup.py sdist bdist_wheel
           twine upload dist/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8315641..5477864 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,12 +10,12 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
 
     steps:
       - uses: actions/checkout@v2
@@ -25,8 +25,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install setuptools
+          # For 3.12, setuptools doesn't come pre-installed
+          python -m pip install --upgrade pip setuptools
           pip install -e .[ci]
       - name: Lint with flake8
         run: |
diff --git a/setup.py b/setup.py
index 9ebc5d6..a772e62 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,8 @@
     'pytest-cov>=2',
 
     'flake8-builtins',
-    'flake8-commas',
+    # Cannot install on python 3.12, project is archived
+    'flake8-commas ; python_version < "3.12"',
     'flake8-fixme',
     'flake8-print',
     'flake8-quotes',
@@ -64,12 +65,12 @@
 
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
 
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Quality Assurance',