diff --git a/.github/workflows/dev_release_esptool_pypi.yml b/.github/workflows/dev_release_esptool_pypi.yml
index 8f12e6846..a4fbbf5c1 100644
--- a/.github/workflows/dev_release_esptool_pypi.yml
+++ b/.github/workflows/dev_release_esptool_pypi.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install twine 'setuptools>=64'
+        python -m pip install twine build
 
     - name: Create development release ${{ github.ref_name }}
       env:
@@ -36,6 +36,5 @@ jobs:
         python -m pip download esptool==$(python setup.py -V) && echo "Version ${{ github.ref_name }} already published, skipping..." && exit 1
 
         echo "Packaging and publishing new esptool development release: ${{ github.ref_name }}"
-        python setup.py sdist
-        tar -ztvf dist/*
+        python -m build
         twine upload dist/*
diff --git a/.github/workflows/release_esptool_pypi.yml b/.github/workflows/release_esptool_pypi.yml
index 8268e24d1..021b11483 100644
--- a/.github/workflows/release_esptool_pypi.yml
+++ b/.github/workflows/release_esptool_pypi.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install 'setuptools>=64' twine
+        pip install twine build
     - name: Build and upload esptool ${{ github.event.release.tag_name }}
       env:
         TWINE_USERNAME: __token__
@@ -34,7 +34,6 @@ jobs:
           exit 1
         else
           echo "Packaging and publishing new esptool version: ${CURRENT_VERSION}"
-          python setup.py sdist
-          tar -ztvf dist/*
+          python -m build
           twine upload dist/*
         fi