diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
deleted file mode 100644
index dc8834a..0000000
--- a/.github/workflows/build-and-deploy.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Build and upload to PyPI
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-n-publish:
-    name: Build and publish Python distributions to PyPI
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-      with:
-        fetch-depth: 0
-    - name: Checkout lastest tagged version
-      run: git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
-    - name: Set up Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: "3.x"
-    - name: Install pypa/build
-      run: >-
-        python3 -m
-        pip install
-        build
-        --user
-    - name: Build a binary wheel and a source tarball
-      run: >-
-        python3 -m
-        build
-        --sdist
-        --wheel
-        --outdir dist/
-        .
-    - name: Publish distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.TOOLS_PYPI_PAK }}
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 5360e08..4c8adbf 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -14,4 +14,4 @@ on:
 jobs:
   call-changelog-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.21.0
diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
new file mode 100644
index 0000000..9b4042c
--- /dev/null
+++ b/.github/workflows/distribute.yml
@@ -0,0 +1,14 @@
+name: Build and Distribute to PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  call-pypi-workflow:
+    uses: ASFHyP3/actions/.github/workflows/reusable-pypi.yml@v0.21.0
+    permissions:
+      contents: read
+    secrets:
+      PYPI_TOKEN: ${{ secrets.TOOLS_PYPI_PAK }}
\ No newline at end of file
diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml
index d729153..2ac151a 100644
--- a/.github/workflows/labeled-pr.yml
+++ b/.github/workflows/labeled-pr.yml
@@ -13,4 +13,4 @@ on:
 jobs:
   call-labeled-pr-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.21.0
diff --git a/.github/workflows/release-checklist-comment.yml b/.github/workflows/release-checklist-comment.yml
index ea39a9b..592f76a 100644
--- a/.github/workflows/release-checklist-comment.yml
+++ b/.github/workflows/release-checklist-comment.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   call-release-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.21.0
     permissions:
       pull-requests: write
     secrets:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d7c30d5..0d772f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   call-release-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.21.0
     with:
       release_prefix: SatChip
       release_branch: main
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index c82e137..6b0e29e 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -5,13 +5,13 @@ on: push
 jobs:
   call-secrets-analysis-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.21.0
 
   call-ruff-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.21.0
 
   call-mypy-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.21.0
     permissions:
       contents: read
diff --git a/.github/workflows/tag-version.yml b/.github/workflows/tag-version.yml
index 0001cee..6202b12 100644
--- a/.github/workflows/tag-version.yml
+++ b/.github/workflows/tag-version.yml
@@ -8,6 +8,6 @@ on:
 jobs:
   call-bump-version-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.21.0
     secrets:
       USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c592ab5..7ee4ea3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   call-pytest-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.20.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.21.0
     with:
       local_package_name: satchip
       python_versions: >-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a06ebb6..27df51c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.1]
+
+### Added
+* New builds are now automatically published to PyPI on release. 
+
 ## [0.6.0]
 
 ### Added