diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index d8eb70f0d..cdcda5ef3 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -45,13 +45,10 @@ jobs:
           ref: ${{ github.event.inputs.ffcx_ref }}
 
       - name: Upgrade pip and setuptools
-        run: python -m pip install setuptools pip --upgrade
-
-      - name: Build wheel
-        run: python setup.py bdist_wheel
-
-      - name: Build sdist
-        run: python setup.py sdist --formats=bztar,gztar
+        run: python -m pip install setuptools pip build --upgrade
+      
+      - name: Build sdist and wheel
+        run: python -m build .
 
       - uses: actions/upload-artifact@v2
         with:
@@ -66,16 +63,18 @@ jobs:
         with:
           name: artifact
           path: dist
-
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
-        if: ${{ github.event.inputs.test_pypi_publish }}
+      
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.5.0
+        if: ${{ github.event.inputs.pypi_publish == 'true' }}
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
-          repository_url: https://pypi.org/legacy/
-
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
-        if: ${{ github.event.inputs.pypi_publish }}
+          repository_url: https://upload.pypi.org/legacy/
+      
+      - name: Publish to Test PyPI
+        uses: pypa/gh-action-pypi-publish@v1.5.0
+        if: ${{ github.event.inputs.test_pypi_publish == 'true' }}
         with:
           user: __token__
           password: ${{ secrets.PYPI_TEST_TOKEN }}
diff --git a/setup.cfg b/setup.cfg
index 9087fa4a3..8ae451223 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,7 +14,7 @@ project_urls =
     Issues = https://github.com/FEniCS/ffcx/issues
     Funding = https://numfocus.org/donate
 long_description = file: README.rst
-long_description_content_type = text/rst
+long_description_content_type = text/x-rst
 license=LGPL-3.0-or-later
 classifiers =
     Development Status :: 5 - Production/Stable