diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f222509..a3173c58 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,8 @@ name: Release Drafter and Publisher
 
 on:
   pull_request:
-    types: [closed]
+    branches:
+      - master
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_protected == 'true' && github.sha || github.ref }}-{{ github.event_name }}
@@ -13,7 +14,7 @@ permissions:
 
 jobs:
   new_release:
-    if: github.event.pull_request.merged == true
+    # if: github.event.pull_request.merged == true
     permissions:
       # write permission is required to create a github release
       contents: write
@@ -57,16 +58,35 @@ jobs:
           NEXT_VERSION="v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}"
           echo ::set-output name=NEXT_VERSION::"$NEXT_VERSION"
 
-      - name: Create and publish new tag
+      - name: Update CHANGELOG.md
         run: |
-          git tag ${{ steps.nextversion.outputs.NEXT_VERSION }}
-          git push origin ${{ steps.nextversion.outputs.NEXT_VERSION }}
+          EXISTING_CHANGELOG=$(cat CHANGELOG.md)
+          echo "     " > CHANGELOG.md
+          echo "## ${{ steps.nextversion.outputs.NEXT_VERSION }}" >> CHANGELOG.md
+          echo "* ${{ github.event.pull_request.title }} (#${{ github.event.pull_request.number }}) @${{ github.event.pull_request.user.login }}" >> CHANGELOG.md
+          echo "     " >> CHANGELOG.md
+          echo -e "$EXISTING_CHANGELOG" >> CHANGELOG.md
 
-      - uses: release-drafter/release-drafter@v5
-        with:
-          commitish: master
-          name: "stellar-etl ${{ steps.nextversion.outputs.NEXT_VERSION }}"
-          tag: ${{ steps.nextversion.outputs.NEXT_VERSION }}
-          publish: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit changes
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add CHANGELOG.md
+          git commit -m "Update CHANGELOG.md for PR #${{ github.event.pull_request.number }}"
+
+      - name: Push changes
+        run: git push origin HEAD:patch/add-changelog
+
+      # - name: Create and publish new tag
+      #   run: |
+      #     git tag ${{ steps.nextversion.outputs.NEXT_VERSION }}
+      #     git push origin ${{ steps.nextversion.outputs.NEXT_VERSION }}
+
+      # - uses: release-drafter/release-drafter@v5
+      #   with:
+      #     commitish: master
+      #     name: "stellar-etl ${{ steps.nextversion.outputs.NEXT_VERSION }}"
+      #     tag: ${{ steps.nextversion.outputs.NEXT_VERSION }}
+      #     publish: true
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..513b443f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,35 @@
+## v2.0.0
+
+* Release/CI enhancements (#247) @laysabit
+* Update readme (#245) @chowbao
+* Create codeql.yml (#243) @kanwalpreetd
+* Update to latest stellar/go change with updated ledgerexporter zstd (#244) @chowbao
+* Update to use BufferedStorageBackend to read txmeta files (#242) @chowbao
+* Add contract code fees (#241) @chowbao
+* Add fee fields; formatting for warnings (#240) @chowbao
+* adding ledgerbackend datastore txmeta as a data source (#235) @chowbao
+* Feature/change workdir (#238) @edualvess
+* Add `ledger_key_hash` to `history_operations` (#237) @lucaszanotelli
+* Bump google.golang.org/protobuf from 1.32.0 to 1.33.0 (#232) @dependabot
+* Fix operation trace code bug (#236) @chowbao
+* Fix fee charged calculation (#234) @chowbao
+* Release drafter and publisher (#233) @laysabit
+* Update soroban fees (#231) @chowbao
+* Add case for null operationResultTr for operation_trace_code (#230) @chowbao
+* Enable diagnostic events (#229) @chowbao
+* Log Transaction Codes and Operation Traces (#228) @sydneynotthecity
+
+## v1.0.0
+
+* Update stellar-core version by @chowbao in https://github.com/stellar/stellar-etl/pull/216
+* doc : commented functions in cmd and internal/input folder   by @laysabit in https://github.com/stellar/stellar-etl/pull/217
+* Add user agent to captive core config by @chowbao in https://github.com/stellar/stellar-etl/pull/219
+* Add export all history command by @chowbao in https://github.com/stellar/stellar-etl/pull/220
+* Add OperationTypeManageSellOffer operation type to history_assets export by @cayod in https://github.com/stellar/stellar-etl/pull/214
+* Export_assets fix by @cayod in https://github.com/stellar/stellar-etl/pull/222
+* Update core image for testnet reset by @chowbao in https://github.com/stellar/stellar-etl/pull/223
+* use NewLedgerChangeReaderFromLedgerCloseMeta by @sfsf9797 in https://github.com/stellar/stellar-etl/pull/221
+* Fix contract data balance holder by @chowbao in https://github.com/stellar/stellar-etl/pull/225
+* Revert "Fix contract data balance holder" by @chowbao in https://github.com/stellar/stellar-etl/pull/226
+* Add common interface to write exported files by @chowbao in https://github.com/stellar/stellar-etl/pull/215
+* Fix soroban hashes to hexstring by @chowbao in https://github.com/stellar/stellar-etl/pull/227
\ No newline at end of file