diff --git a/.github/workflows/do_release.yml b/.github/workflows/do_release.yml
new file mode 100644
index 000000000..48c98a7bc
--- /dev/null
+++ b/.github/workflows/do_release.yml
@@ -0,0 +1,60 @@
+name: Draft release
+
+on:
+  push:
+    branches:
+      - next
+
+jobs:
+  create_release:
+    name: Create release
+    if: startsWith(github.head_ref , 'release/')
+    # we could check for tags but
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get the version tag
+        id: version_tag
+        run: |
+          echo tag_name=${GITHUB_REF#refs/tags/} >> $GITHUB_OUTPUT
+      - name: Get latest release tag
+        id: latest_release
+        run: |
+          LATEST_RELEASE_TAG=$(curl --silent "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/latest" \
+            | jq -r .tag_name)
+          echo "Latest release tag is $LATEST_RELEASE_TAG"
+          echo "::set-output name=tag::$LATEST_RELEASE_TAG"
+        shell: bash
+      - name: Get release branch name
+        id: release_branch_name
+        run: |
+          echo RELEASE_BRANCH_NAME="${RELEASE_NAME=${GITHUB_HEAD_REF#release/}}" >> $GITHUB_OUTPUT
+      - name: Replace underscores and capitalize
+        id: release_title
+        run: |
+          TITLE=${{steps.release_branch_name.outputs.RELEASE_BRANCH_NAME}}
+          TITLE=${TITLE//_/ }  # Replace underscores with spaces
+          TITLE=${TITLE//-/ }  # Replace dash with spaces
+          TITLE=${TITLE^^}  # Capitalize the first letter
+          echo title=$TITLE >> $GITHUB_OUTPUT
+      - name: Create release
+        id: create_release
+        run: |
+          gh release edit ${{steps.version_tag.outputs.tag_name}}
+          --title="${{steps.version_tag.outputs.tag_name}} ${{steps.release_title.outputs.title}}" \
+          --draft=false
+  rebase_main:
+    name: Rebase main
+    needs: create_release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Rebase main
+        run: |
+          git checkout next
+          git pull
+          git checkout main
+          git rebase next
+          git push --tags
+
+
diff --git a/package-lock.json b/package-lock.json
index 28b0e1998..1981a5503 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "curriculum",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "curriculum",
-      "version": "8.2.0",
+      "version": "8.2.1",
       "license": "CC-BY-SA-4.0",
       "dependencies": {
         "@emotion/react": "^11.11.3",
diff --git a/package.json b/package.json
index 5b755d67c..94f04b965 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,10 @@
     "preview": "vite preview",
     "test": "vitest run ./src/components/**/*.spec.jsx",
     "link-parser": "rm -rf node_modules/@laboratoria/curriculum-parser && ln -s ../../../curriculum-parser node_modules/@laboratoria/",
-    "link-react": "rm -rf node_modules/@laboratoria/react && ln -s ../../../react node_modules/@laboratoria/"
+    "link-react": "rm -rf node_modules/@laboratoria/react && ln -s ../../../react node_modules/@laboratoria/",
+    "preversion": "npm test",
+    "version": "rm -rf dist && npm run build:content && git add -A dist",
+    "postversion": "echo 'post versioning should do git push and git push --tags'"
   },
   "dependencies": {
     "@emotion/react": "^11.11.3",