diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh
index ac6d336..7275760 100755
--- a/.github/workflows/release_prep.sh
+++ b/.github/workflows/release_prep.sh
@@ -114,6 +114,7 @@ http_archive(
   name = "${WORKSPACE_NAME}",
   url = "https://github.com/helly25/${PACKAGE_NAME}/releases/download/${TAG}/${ARCHIVE}",
   sha256 = "${SHA256}",
+  strip_prefix = "${PREFIX}",
 )
 \`\`\`
 EOF
diff --git a/tools/trigger_release.sh b/tools/trigger_release.sh
index 8cf6f6e..b8c1036 100755
--- a/tools/trigger_release.sh
+++ b/tools/trigger_release.sh
@@ -54,8 +54,9 @@ fi
 
 grep "${VERSION}" < <(git tag -l) && die "Version tag is already in use."
 
-# Should the tag have the changelog parts?
-git tag -s -a "${VERSION}" -m "New release tag version: '${VERSION}'."
+git tag -s -a "${VERSION}" \
+    -m "New release tag version: '${VERSION}'." \
+    -m "$(awk '/^#/{if(NR>1)exit}/^[^#]/{print}' <CHANGELOG.md)"
 git push origin --tags
 
 echo "Next version: ${NEXT_VERSION}"
@@ -97,7 +98,7 @@ if which gh; then
         else
             gh pr merge "${NEXT_BRANCH}" --auto -d -s -b "${MERGE_BODY}" -t "${MERGE_SUBJECT}"
             git checkout main
-            git branch -d "${NEXT_BRANCH}"
+            git branch -d "${NEXT_BRANCH}" || true
             echo "PR ${PRNUM} cannot be merged via admin override."
             echo "Please approve it at ${PRURL}."
         fi