diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 706c376..e92558d 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -14,16 +14,10 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: 3.11
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade setuptools build wheel
-    - name: Build a binary wheel and a source tarball
-      run: |
-        python -m build
+    - name: Build and check package
+      uses: hynek/build-and-inspect-python-package@v2
     - name: Publish to PyPI
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 45c9af5..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-recursive-include tagulous/static *
-recursive-include tagulous/templates *
diff --git a/pyproject.toml b/pyproject.toml
index 6119ae0..e2a5580 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,12 +36,12 @@ Changelog = "https://django-tagulous.readthedocs.io/en/latest/changelog.html"
 Repository = "https://github.com/radiac/django-tagulous"
 Issues = "https://github.com/radiac/django-tagulous/issues"
 
-[tool.setuptools]
-include-package-data = true
-
 [tool.setuptools.packages.find]
 include = ["tagulous*"]
-exclude = ["docs*", "tests*", "examples*", "src*", "dist*"]
+exclude = ["docs*", "tests*", "examples*", "dist*"]
+
+[tool.setuptools.package-data]
+tagulous = ["static/**/*", "templates/**/*"]
 
 [tool.setuptools.dynamic]
 version = {attr = "tagulous.__version__"}
diff --git a/tagulous/__init__.py b/tagulous/__init__.py
index 67595f5..2b3b4d5 100644
--- a/tagulous/__init__.py
+++ b/tagulous/__init__.py
@@ -3,6 +3,6 @@
 Django Tagulous - Fabulous Tags
 """
 
-__version__ = "2.0.0"
+__version__ = "2.1.0-rc1"
 __license__ = "BSD"
 __author__ = "Richard Terry"