diff --git a/.github/workflows/python-publish-test.yml b/.github/workflows/python-publish-test.yml
index 82dace7..72a8643 100644
--- a/.github/workflows/python-publish-test.yml
+++ b/.github/workflows/python-publish-test.yml
@@ -14,12 +14,17 @@ jobs:
     environment: release-pypi
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
+    environment:
+      name: release-pypi
+      url: https://test.pypi.org/p/waves
+    permissions:
+      id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 
@@ -32,7 +37,3 @@ jobs:
 
       - name: Publish package to Test PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: True
-          password: ${{ secrets.TEST_PYPI_PASSWORD }}
-          repository-url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index e90d7b9..0ea1840 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -13,12 +13,17 @@ jobs:
     # Upload to PyPI on every published release
     if: github.event.action == 'published'
     runs-on: ubuntu-latest
+    environment:
+      name: release-pypi
+      url: https://pypi.org/p/waves
+    permissions:
+      id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 
@@ -31,6 +36,3 @@ jobs:
 
       - name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: True
-          password: ${{ secrets.PYPI_PASSWORD }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 339a271..bf9c957 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
   can be updated annually as needed.
 - A pre-commit workflow is added to be run against PRs into the main and develop branches to ensure
   code quality checks are passed.
+- Converts the Test PyPI and PyPI to use the trusted publisher functionality.
 
 ## v0.6.2 - 1 December 2025