diff --git a/docs/deliver-to-pypi.md b/docs/deliver-to-pypi.md
index 4d351f25..35d36062 100644
--- a/docs/deliver-to-pypi.md
+++ b/docs/deliver-to-pypi.md
@@ -33,4 +33,4 @@ Obviously, manual steps are for chumps, so we can automate this a little by usin
 
 If you don't need much control over the release of a package, you can set up cibuildwheel to deliver the wheels straight to PyPI. This doesn't require anycloud storage to work - you just need to bump the version and tag it.
 
-[`examples/travis-deploy-only.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-deploy-only.yml) and [`examples/github-deploy-only.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-deploy-only.yml) are example configurations that automatocially upload wheels to PyPI. Also check out [this example repo](https://github.com/joerick/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up.
+[`examples/travis-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-deploy.yml) are example configurations that automatocially upload wheels to PyPI. Also check out [this example repo](https://github.com/joerick/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up.
diff --git a/docs/setup.md b/docs/setup.md
index 1e29f94d..1ff2bc55 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -15,7 +15,7 @@ Commit this file, and push to Github - either to your default branch, or to a PR
 
 For more info on this file, check out the [docs](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions).
 
-[`examples/github-deploy-only.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy-only.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
+[`examples/github-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
 
 # Azure Pipelines [linux/mac/windows] {: #azure-pipelines}
 
@@ -48,7 +48,7 @@ Commit this file, enable building of your repo on Travis CI, and push.
 
 Then setup a deployment method by following the [Travis CI deployment docs](https://docs.travis-ci.com/user/deployment/), or see [Delivering to PyPI](deliver-to-pypi.md). For more info on `.travis.yml`, check out the [docs](https://docs.travis-ci.com/).
 
-[`examples/travis-deploy-only.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-deploy-only.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
+[`examples/travis-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
 
 # CircleCI [linux/mac] {: #circleci}
 
diff --git a/examples/github-deploy-only.yml b/examples/github-deploy.yml
similarity index 89%
rename from examples/github-deploy-only.yml
rename to examples/github-deploy.yml
index 4f0a430a..f54bd0c4 100644
--- a/examples/github-deploy-only.yml
+++ b/examples/github-deploy.yml
@@ -33,7 +33,7 @@ jobs:
 
     - uses: actions/upload-artifact@v2
       with:
-        path: ./wheelhouse
+        path: ./wheelhouse/*.whl
 
   build_sdist:
     name: Build source distribution
@@ -47,11 +47,11 @@ jobs:
         python-version: '3.7'
 
     - name: Build sdist
-      run: python setup.py sdist -d wheelhouse/
+      run: python setup.py sdist
 
     - uses: actions/upload-artifact@v2
       with:
-        path: wheelhouse/*.tar.gz
+        path: dist/*.tar.gz
 
   upload_pypi:
     needs: [build_wheels, build_sdist]
@@ -68,14 +68,13 @@ jobs:
     - uses: actions/download-artifact@v2
       with:
         name: artifact
-        path: wheelhouse
+        path: dist
 
-    - run: twine check wheelhouse/*
+    - run: twine check dist/*
 
     - uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}
-        packages_dir: ./wheelhouse/
         # To test: repository_url: https://test.pypi.org/legacy/
       if: github.event_name == 'release' && github.event.action == 'published'
diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml
index fa00a6d8..70977138 100644
--- a/examples/github-minimal.yml
+++ b/examples/github-minimal.yml
@@ -33,4 +33,4 @@ jobs:
 
     - uses: actions/upload-artifact@v2
       with:
-        path: ./wheelhouse
+        path: ./wheelhouse/*.whl
diff --git a/examples/travis-ci-deploy-only.yml b/examples/travis-ci-deploy.yml
similarity index 100%
rename from examples/travis-ci-deploy-only.yml
rename to examples/travis-ci-deploy.yml