diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fff3941..7ac0b21 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,15 +38,17 @@ jobs:
           EOM
           )"
 
+          CHANGELOG="${CHANGELOG//'%'/'%25'}"
+          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
+          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           echo "::set-output name=changelog::$CHANGELOG"
       # Update Unreleased section with the current release note
       - name: Patch Changelog
         if: ${{ steps.properties.outputs.changelog != '' }}
+        env:
+          CHANGELOG: ${{ steps.properties.outputs.changelog }}
         run: |
-          ./gradlew patchChangelog --release-note "$(cat << 'EOM'
-          ${{ steps.properties.outputs.changelog }}
-          EOM
-          )"
+          ./gradlew patchChangelog --release-note="$CHANGELOG"
       # Publish the plugin to the Marketplace
       - name: Publish Plugin
         env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de13fac..39ddc37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ## [Unreleased]
 ### Fixed
 - NullPointerException on key completion
+- Changelog handling in release flow
 
 ### Changed
 - Updated plugin dependencies