diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7aba0a92..c59b80b8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -36,6 +36,7 @@ jobs:
         with:
             disable_ccache: true
 
+
       - name: Setup conan
         uses: ./.github/actions/setup_conan
         id: conan
@@ -114,23 +115,29 @@ jobs:
       - name: Prepare files
         shell: bash
         run: |
+          cp ${{ github.workspace }}/.github/workflows/nightly_notes.md "${RUNNER_TEMP}/nightly_notes.md"
           cd nightly_release
           rm -r clio_tests*
-          CLIO_SHA256_SUMS=''
           for d in $(ls); do
             archive_name=$(ls $d)
             mv ${d}/${archive_name} ./
             rm -r $d
             sha256sum ./$archive_name > ./${archive_name}.sha256sum
-            echo -e "$(cat ./${archive_name}.sha256sum)\n${CLIO_SHA256_SUMS}"
+            cat ./$archive_name.sha256sum >> "${RUNNER_TEMP}/nightly_notes.md"
           done
-          echo $CLIO_SHA256_SUMS >> $GITHUB_ENV
+          echo '```' >> "${RUNNER_TEMP}/nightly_notes.md"
+
+      - name: Remove current nightly release and nightly tag
+        shell: bash
+        run: |
+          gh release delete nightly --yes || true
+          git push origin :nightly || true
 
       - name: Publish nightly release
         shell: bash
         run: |
           gh release create nightly --prerelease --title "Clio development (nightly) build" \
-            --target $GITHUB_SHA --notes-file "${{ github.workspace }}/.github/workflows/nightly_notes.md" \
+            --target $GITHUB_SHA --notes-file "${RUNNER_TEMP}/nightly_notes.md" \
             ./nightly_release/clio_server*
 
 
diff --git a/.github/workflows/nightly_notes.md b/.github/workflows/nightly_notes.md
index bda89ec6..38deb430 100644
--- a/.github/workflows/nightly_notes.md
+++ b/.github/workflows/nightly_notes.md
@@ -1,12 +1,6 @@
-```
-Based on commit: $GITHUB_SHA
-```
-
 > **Note:** Please remember that this is a development release and it is not recommended for production use.
 
-Changelog (including previous releases): https://github.com/kuznetsss/clio/commits/nightly
+Changelog (including previous releases): https://github.com/XRPLF/clio/commits/nightly
 
 ## SHA256 checksums
 ```
-$(CLIO_SHA256_SUMS)
-```