diff --git a/.github/workflows/build_changelog.yml b/.github/workflows/build_changelog.yml
new file mode 100644
index 00000000000..f0501083048
--- /dev/null
+++ b/.github/workflows/build_changelog.yml
@@ -0,0 +1,10 @@
+# Standalone workflow to update changelog if necessary
+name: Build changelog
+
+on:
+  workflow_dispatch:
+
+jobs:
+  changelog:
+    needs: release
+    uses: ./.github/workflows/reusable_publish_changelog.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/on_release_notes.yml
similarity index 91%
rename from .github/workflows/publish.yml
rename to .github/workflows/on_release_notes.yml
index 16e51a5f542..563d1fefc79 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/on_release_notes.yml
@@ -20,6 +20,9 @@ name: Publish to PyPi
 
 # See MAINTAINERS.md "Releasing a new version" for release mechanisms
 
+env:
+  BRANCH: develop
+
 on:
   release:
     types: [published]
@@ -101,17 +104,14 @@ jobs:
           aws ssm put-parameter --name "powertools-python-release-version" --value $RELEASE_VERSION --overwrite
           aws codepipeline start-pipeline-execution --name ${{ secrets.AWS_SAR_PIPELINE_NAME }}
 
-  # NOTE: `event` type brings a detached head failing git setup
-  # and reusable workflows only work as a standalone job
-  # meaning we need to research for a solution that works for non-detached and detached mode
-  # changelog:
-  #   needs: release
-  #   permissions:
-  #     contents: write
-  #   uses: ./.github/workflows/reusable_publish_changelog.yml
+  changelog:
+    needs: release
+    permissions:
+      contents: write
+    uses: ./.github/workflows/reusable_publish_changelog.yml
 
   docs:
-    needs: release
+    needs: [release, changelog]
     permissions:
       contents: write
       pages: write
@@ -122,10 +122,13 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup git client
+      - name: Git client setup and refresh tip
         run: |
           git config user.name "Release bot"
-          git config user.email aws-devax-open-source@amazon.com
+          git config user.email "aws-devax-open-source@amazon.com"
+          git config pull.rebase true
+          git config remote.origin.url >&- || git remote add origin https://github.com/$origin # Git Detached mode (release notes) doesn't have origin
+          git pull origin $BRANCH
       - name: Install poetry
         run: pipx install poetry
       - name: Set up Python
diff --git a/.github/workflows/reusable_publish_changelog.yml b/.github/workflows/reusable_publish_changelog.yml
index 9bd0959d1c8..2cb786ed86a 100644
--- a/.github/workflows/reusable_publish_changelog.yml
+++ b/.github/workflows/reusable_publish_changelog.yml
@@ -6,6 +6,9 @@ on:
 permissions:
   contents: write
 
+env:
+  BRANCH: develop
+
 jobs:
   publish_changelog:
     # Force Github action to run only a single job at a time (based on the group name)
@@ -23,11 +26,13 @@ jobs:
           git config user.name "Release bot"
           git config user.email "aws-devax-open-source@amazon.com"
           git config pull.rebase true
-          git pull --rebase
+          git config remote.origin.url >&- || git remote add origin https://github.com/$origin # Git Detached mode (release notes) doesn't have origin
+          git pull origin $BRANCH
       - name: "Generate latest changelog"
         run: make changelog
       - name: Update Changelog in trunk
         run: |
           git add CHANGELOG.md
           git commit -m "update changelog with latest changes"
-          git push origin HEAD:refs/heads/develop
+          git pull origin $BRANCH # prevents concurrent branch update failing push
+          git push origin HEAD:refs/heads/$BRANCH