diff --git a/.github/workflows/editor-changelog.yaml b/.github/workflows/editor-changelog.yaml
index e2d6d7760a..b9b02cd5e0 100644
--- a/.github/workflows/editor-changelog.yaml
+++ b/.github/workflows/editor-changelog.yaml
@@ -60,11 +60,12 @@ jobs:
         id: get_last_tag
         run: |
           git fetch --all --tags
-          LAST_TAG=$(git describe --tags --match "v*-editor" --abbrev=0 2>/dev/null || echo "none")
+          LAST_TAG=$(git tag -l "v*-editor" | sort -V | tail -n 1 || echo "none")
           if [ "$LAST_TAG" == "none" ]; then
             echo "No previous tag found, this is the first release"
             echo "LAST_TAG=" >> $GITHUB_ENV
           else
+            echo "Found tag: $LAST_TAG"
             echo "LAST_TAG=$LAST_TAG" >> $GITHUB_ENV
           fi
 
@@ -89,16 +90,21 @@ jobs:
         if: env.no_editor_changes == 'true'
         run: exit 0
 
-      - name: Get merged PRs affecting editor package (last 10 if no tag)
+      - name: Get merged PRs affecting editor package (last 50 if no tag)
         if: env.version_changed == 'true' && env.no_editor_changes == 'false'
         id: get_prs
         run: |
           if [ -z "$LAST_TAG" ]; then
-            # No tag, get last 10 PRs
-            PRS=$(curl -s "https://api.github.com/repos/serlo/frontend/pulls?state=closed&per_page=10" | jq -r '.[] | .number' | tr '\n' ' ')
+            # No tag, get last 50 PRs
+            PRS=$(curl -s "https://api.github.com/repos/serlo/frontend/pulls?state=closed&per_page=50" | jq -r '.[] | .number' | tr '\n' ' ')
           else
-            # Fetch PRs since last tag
-            PRS=$(curl -s "https://api.github.com/repos/serlo/frontend/pulls?state=closed&per_page=100" | jq -r '.[] | select(.merged_at != null and .merged_at > $GITHUB_ENV.LAST_TAG and .head.repo.full_name == "serlo/frontend") | .number' | tr '\n' ' ')
+            # Get the commit date of the last tag
+            TAG_DATE=$(git log -1 --format=%aI $LAST_TAG)
+            # Fetch PRs since tag commit date
+            PRS=$(curl -s "https://api.github.com/repos/serlo/frontend/pulls?state=closed&per_page=100" | \
+              jq -r --arg TAG_DATE "$TAG_DATE" \
+              '.[] | select(.merged_at != null and .merged_at > $TAG_DATE and .head.repo.full_name == "serlo/frontend") | .number' | \
+              tr '\n' ' ')
           fi
           echo "PR_NUMBERS=$PRS" >> $GITHUB_ENV
 
@@ -161,8 +167,12 @@ jobs:
           echo "" >> temp_changelog.md
           echo -e "$PR_TITLES" >> temp_changelog.md
           echo "" >> temp_changelog.md
-          echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/v$NPM_VERSION...v$CURRENT_VERSION" >> temp_changelog.md
-          echo "" >> temp_changelog.md
+          if [ -n "$LAST_TAG" ]; then
+            echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${LAST_TAG}...v${CURRENT_VERSION}-editor" >> temp_changelog.md
+          else
+            echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/v${NPM_VERSION}-editor...v${CURRENT_VERSION}-editor" >> temp_changelog.md
+          fi
+          echo "" >> temp_changelog.md || exit 1
 
           # Combine new changelog with existing one (if it exists)
           if [ -f packages/editor/CHANGELOG.md ]; then
diff --git a/.github/workflows/editor.yaml b/.github/workflows/editor.yaml
index 033833e46d..e01e7eb12a 100644
--- a/.github/workflows/editor.yaml
+++ b/.github/workflows/editor.yaml
@@ -46,8 +46,9 @@ jobs:
       - name: Create and push Git tag
         if: steps.check_published.outputs.already_published == 'false'
         run: |
-          git tag v$CURRENT_VERSION
-          git push origin v$CURRENT_VERSION
+          TAG_NAME="v${CURRENT_VERSION}-editor"
+          git tag "$TAG_NAME"
+          git push origin "$TAG_NAME"
 
       - name: Extract changelog for current version
         id: extract_changelog
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index e9d179787c..cd4294f73a 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -1,7 +1,36 @@
-## Changelog for version 0.16.0
+## Changelog for version 0.17.0
 
-- feat(editor): Enable gallery plugin, free text excercise plugin and interactive image (dropzone) plugin
-- fix(rows): check if interactive exercise plugins are supported in menu items filter
-- Some changes to make editor code work in serlo-editor-as-lti-tool
-- fix(editor-packages): Use one redux store per instance of editor
-- fix(e2e): adapt math tests
+- feat(editor): show user a warning in test environments that content might disappear. Thank you [@LarsTheGlidingSquirrel](https://github.com/LarsTheGlidingSquirrel) in https://github.com/serlo/frontend/pull/4216
+- refactor: show editor version in DOM through `data-editor-version`. Thank you [@LarsTheGlidingSquirrel](https://github.com/LarsTheGlidingSquirrel) in https://github.com/serlo/frontend/pull/4215
+- fix(edusharing-plugin): use correct import. Thank you [@LarsTheGlidingSquirrel](https://github.com/LarsTheGlidingSquirrel) in https://github.com/serlo/frontend/pull/4214
+- fix(edusharing-plugin): not use `dangerouslySetInnerHtml` & sanitize html to prevent XSS. Thank you [@LarsTheGlidingSquirrel](https://github.com/LarsTheGlidingSquirrel) in https://github.com/serlo/frontend/pull/4213
+- fix(editor): prevent creating exercises in multimedia, other exercise, solution. Thank you [@LarsTheGlidingSquirrel](https://github.com/LarsTheGlidingSquirrel) in https://github.com/serlo/frontend/pull/4212
+- refactor(frontend): remove revision history loader. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4211
+- fix(exercise): make sure math controls end up in text toolbar not in exercise toolbar. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4210
+- fix(exercise): add suspense to avoid error. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4208
+- refactor(editor): refactor providers, hack last frontend deps. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4206
+- refactor(audio): move privacy wrapper out of editor. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4205
+- refactor(editor): move serlo content loaders out of editor. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4204
+- refactor(course): use a wrapper to inject router into course renderer. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4203
+- refactor(editor): move save modal outside of editor, refactor. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4202
+- refactor(frontend): remove notification settings from save modal. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4201
+- refactor(frontend): remove email notification setting. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4200
+- refactor(editor): move main toolbar / undoredo to editor. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4199
+- refactor(injection): clean code, allow staging for now. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4198
+- feat(image): add new upload code for testing. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4197
+- refactor(editor): add hook for serlo quickbar data, duplicate some code. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4195
+- refactor(article): replace frontend link comp. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4194
+- refactor(page-patners): remove frontend dependency. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4193
+- refactor(injection): move serlo code back to editor & add server endpoint for fetch. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4192
+- feat(blanks): hide exercise task until child plugin is selected, focus child plugin after selection. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4188
+- Deployment. Thank you [@elbotho](https://github.com/elbotho) in https://github.com/serlo/frontend/pull/4182
+
+**Full Changelog**: https://github.com/serlo/frontend/compare/v0.16.0-editor...v0.17.0-editor
+
+## Changelog for version 0.16
+
+feat(editor): Enable gallery plugin, free text exercise plugin and interactive image (dropzone) plugin
+fix(rows): check if interactive exercise plugins are supported in menu items filter
+Some changes to make editor code work in serlo-editor-as-lti-tool
+fix(editor-packages): Use one redux store per instance of editor
+fix(e2e): adapt math tests
diff --git a/packages/editor/package.json b/packages/editor/package.json
index d5203f10e6..ea01e64f55 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serlo/editor",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "homepage": "https://de.serlo.org/editor",
   "bugs": {
     "url": "https://github.com/serlo/frontend/issues"