diff --git a/.github/workflows/build_publish_pypi_and_draft_release.yaml b/.github/workflows/build_publish_pypi_and_draft_release.yaml
index 850c1910d..c86315c23 100644
--- a/.github/workflows/build_publish_pypi_and_draft_release.yaml
+++ b/.github/workflows/build_publish_pypi_and_draft_release.yaml
@@ -61,11 +61,16 @@ jobs:
     needs:
       - build_sdist_and_wheel
       - scan_sdist_and_wheel
-    uses: ./.github/workflows/publish_sdist_and_wheel.yaml
-    with:
-      artifact-name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }}
-      repository-name: pypi
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }}
+      - name: Unzip artifact with dist
+        run: unzip ${{ needs.build_sdist_and_wheel.outputs.artifact-name }}
+      - name: Publish sdist and wheel to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
 
   create_release:
     name: Create draft release
diff --git a/.github/workflows/build_publish_testpypi.yaml b/.github/workflows/build_publish_testpypi.yaml
index e648d2eb8..9480da0e5 100644
--- a/.github/workflows/build_publish_testpypi.yaml
+++ b/.github/workflows/build_publish_testpypi.yaml
@@ -45,8 +45,15 @@ jobs:
     needs:
       - build_sdist_and_wheel
       - scan_sdist_and_wheel
-    uses: ./.github/workflows/publish_sdist_and_wheel.yaml
-    with:
-      artifact-name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }}
-      repository-name: testpypi
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: ${{ needs.build_sdist_and_wheel.outputs.artifact-name }}
+      - name: Unzip artifact with dist
+        run: unzip ${{ needs.build_sdist_and_wheel.outputs.artifact-name }}
+      - name: Publish sdist and wheel to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/publish_sdist_and_wheel.yaml b/.github/workflows/publish_sdist_and_wheel.yaml
deleted file mode 100644
index 777d9a421..000000000
--- a/.github/workflows/publish_sdist_and_wheel.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# © 2024 SolarWinds Worldwide, LLC. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-name: Publish sdist and wheel
-
-on:
-  workflow_call:
-    inputs:
-      artifact-name:
-        type: string
-        required: true
-        description: 'Name of zip archive of sdist and wheels'
-      repository-name:
-        type: string
-        required: false
-        description: "testpypi or pypi"
-
-jobs:
-  publish_sdist_and_wheel:
-    name: Publish sdist and wheel
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v6
-        with:
-          name: ${{ inputs.artifact-name }}
-      - name: Unzip artifact with dist
-        run: unzip ${{ inputs.artifact-name }}
-      - if: ${{ inputs.repository-name == 'testpypi' }}
-        name: Publish sdist and wheel to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-      - if: ${{ inputs.repository-name == 'pypi' }}
-        name: Publish sdist and wheel to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4b6be6ab..0d1df51d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/solarwinds/apm-python/compare/rel-5.1.0...HEAD)
+## [Unreleased](https://github.com/solarwinds/apm-python/compare/rel-5.2.0...HEAD)
+
+## [5.2.0.0](https://github.com/solarwinds/apm-python/releases/tag/rel-5.2.0) - 2025-12-09
+
+### Changed
+- Fixed thread safety of token bucket ([#712](https://github.com/solarwinds/apm-python/pull/712))
+- Updated distro to always opt into `database` new semconv if supported by instrumentation ([#713](https://github.com/solarwinds/apm-python/pull/713))
+- Updated workflows for PyPI trusted publishing ([#719](https://github.com/solarwinds/apm-python/pull/719))
+- Upgraded to OTel Python 1.39.0/0.60b ([#720](https://github.com/solarwinds/apm-python/pull/720))
 
 ## [5.1.0](https://github.com/solarwinds/apm-python/releases/tag/rel-5.1.0) - 2025-10-21
 
diff --git a/image/requirements-nodeps-beta.txt b/image/requirements-nodeps-beta.txt
index 0115098da..899a75ca7 100644
--- a/image/requirements-nodeps-beta.txt
+++ b/image/requirements-nodeps-beta.txt
@@ -1 +1 @@
-solarwinds_apm==5.1.0.0
+solarwinds_apm==5.2.0.0
diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py
index 0d72820f3..e2974ab92 100644
--- a/solarwinds_apm/version.py
+++ b/solarwinds_apm/version.py
@@ -1 +1 @@
-__version__ = "5.1.0"
+__version__ = "5.2.0.0"