diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5b3f529..1782c5c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,6 +9,8 @@ jobs:
   release:
     name: release
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - name: Checkout commit and fetch tag history
         uses: actions/checkout@v2
@@ -25,10 +27,8 @@ jobs:
           python -m pip install --upgrade pip
           pip install setuptools wheel twine
 
-      - name: Build and publish package
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_AZAVEA_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_AZAVEA_PASSWORD }}
-        run: |
-          python setup.py sdist bdist_wheel
-          twine upload dist/*
+      - name: Build release package
+        run: python setup.py sdist bdist_wheel
+
+      - name: Upload release to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/CHANGES.rst b/CHANGES.rst
index 9b01fe6..c6e4871 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -235,3 +235,7 @@ v6.2.0, 2024-01-22
    previously would provide an internal Loc_name field in the response which
    is no longer supplied, which broke the API. Making that field optional in
    our code fixes this.
+
+v6.2.1, 2024-04-15
+------------------
+ * Update PyPI publishing integration
diff --git a/omgeo/tests/tests.py b/omgeo/tests/tests.py
index 5c94861..0304c55 100755
--- a/omgeo/tests/tests.py
+++ b/omgeo/tests/tests.py
@@ -179,7 +179,7 @@ def test_geocode_esri_wgs_senado_mx(self):
         """
         candidates = self.g_esri_wgs.get_candidates(self.pq['senado_mx'])
         self.assertOneCandidate(candidates)
-        search_text = 'Paseo de la Reforma 135'
+        search_text = 'Paseo de La Reforma 135'
         self.assertEqual(search_text in candidates[0].match_addr, True,
                          '"%s" not found in match_addr. Got "%s".'
                          % (search_text, candidates[0].match_addr))
@@ -192,7 +192,7 @@ def test_geocode_structured_esri_wgs_senado_mx(self):
         """
         candidates = self.g_esri_wgs.get_candidates(self.pq['senado_mx_struct'])
         self.assertOneCandidate(candidates)
-        search_text = 'Paseo de la Reforma 135'
+        search_text = 'Paseo de La Reforma 135'
         self.assertEqual(search_text in candidates[0].match_addr, True,
                          '"%s" not found in match_addr. Got "%s".'
                          % (search_text, candidates[0].match_addr))