diff --git a/.craft.yml b/.craft.yml
index 8a778249..6fe003e8 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -6,18 +6,20 @@ statusProvider:
   name: github
   config:
     contexts:
-      - 'build-arm64'
-      - 'build-amd64'
-      - 'assemble-taskbroker-image'
+    - 'build-arm64'
+    - 'build-amd64'
+    - 'assemble-taskbroker-image'
 preReleaseCommand: ""
 targets:
-  - id: release
-    name: docker
-    source: ghcr.io/getsentry/taskbroker
-    target: getsentry/taskbroker
-  - id: latest
-    name: docker
-    source: ghcr.io/getsentry/taskbroker
-    target: getsentry/taskbroker
-    targetFormat: '{{{target}}}:latest'
-  - name: github
+- id: release
+  name: docker
+  source: ghcr.io/getsentry/taskbroker
+  target: getsentry/taskbroker
+- id: latest
+  name: docker
+  source: ghcr.io/getsentry/taskbroker
+  target: getsentry/taskbroker
+  targetFormat: '{{{target}}}:latest'
+- name: github
+versioning:
+  policy: calver
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 59ae628f..15091879 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: Version to release (optional)
+        description: Version to release (or "auto")
         required: false
       force:
         description: Force a release even when there are release-blockers (optional)
@@ -15,6 +15,10 @@ on:
     # We also want it to be 1 hour before the on-prem release
     - cron: "0 17 15 * *"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -31,7 +35,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
       - name: Prepare release
-        uses: getsentry/action-prepare-release@v1
+        uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with: