diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index bbc663777..fe9597ce7 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -19,12 +19,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
         exclude:
-          - os: windows-latest
-            python-version: "3.9"
           - os: windows-latest
             python-version: "3.10"
+          - os: windows-latest
+            python-version: "3.11"
     env:
       DISPLAY: ':99.0'
       OS: ${{ matrix.os }}
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
index 36c592744..6c41d144b 100644
--- a/.github/workflows/pytest.yaml
+++ b/.github/workflows/pytest.yaml
@@ -21,12 +21,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
         exclude:
-          - os: windows-latest
-            python-version: "3.9"
           - os: windows-latest
             python-version: "3.10"
+          - os: windows-latest
+            python-version: "3.11"
     env:
       DISPLAY: ':99.0'
       OS: ${{ matrix.os }}
@@ -57,7 +57,7 @@ jobs:
       run: mypy qcodes_contrib_drivers
     - name: Run tests
       run: |
-        pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=setup.cfg qcodes_contrib_drivers
+        pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=pyproject.toml qcodes_contrib_drivers
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3.1.4
       with:
diff --git a/pyproject.toml b/pyproject.toml
index f65ffd6cc..d3bf46667 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools >= 61.2",
+    "setuptools >= 68.1.2",
     "versioningit >= 2.0.1"
 ]
 build-backend = 'setuptools.build_meta'
@@ -8,8 +8,17 @@ build-backend = 'setuptools.build_meta'
 [project]
 name = "qcodes_contrib_drivers"
 description = "User contributed drivers for QCoDeS"
-classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Science/Research", "License :: OSI Approved :: MIT License", "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Topic :: Scientific/Engineering",]
-requires-python = ">=3.8"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: Scientific/Engineering",]
+requires-python = ">=3.9"
 dependencies = [ "qcodes>=0.37.0", "versioningit>=2.0.1", "packaging"]
 dynamic = [ "version",]
 
@@ -68,6 +77,17 @@ module = [
 ]
 ignore_missing_imports = true
 
+[tool.setuptools]
+zip-safe = false
+license-files = [
+    "LICENSE_TEKTRONIX_AWG520_KEITHLEY_2700",
+    "LICENSE",
+]
+include-package-data = false
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
 [tool.versioningit]
 default-version = "0.0"
 
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 145b74fdd..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# note that only setuptools specific configuration is
-# in this file. Std configuration as defined by pep621
-# and configuration for other tools goes into pyproject.toml
-
-[metadata]
-license_files =
-    LICENSE_TEKTRONIX_AWG520_KEITHLEY_2700
-    LICENSE
-
-[options]
-zip_safe = False
-packages = find:
diff --git a/setup.py b/setup.py
index b095ba7af..d4e045a50 100644
--- a/setup.py
+++ b/setup.py
@@ -3,9 +3,8 @@
 from versioningit import get_cmdclasses
 
 # this file does not contain configuration
-# std configuration as defined by pep621
-# is in pyproject.toml
-# and setuptools specific config in setup.cfg
+# all config should be in pyproject.toml
+
 
 if int(setuptools.__version__.split(".")[0]) < 61:
     raise RuntimeError(