diff --git a/.craft.yml b/.craft.yml
index 301bd71a875..c73fe027580 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,7 +1,8 @@
-minVersion: 2.21.6
+minVersion: 3.7.0
 changelogPolicy: auto
 preReleaseCommand: bash scripts/bump-version.sh
-postReleaseCommand: bash scripts/post-release.sh
+postReleaseBump:
+  version: nightly
 artifactProvider:
   name: none
 targets:
diff --git a/AGENTS.md b/AGENTS.md
index b262a254bf0..6c48a4e31c8 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -97,7 +97,7 @@ AI assistance is welcome, but the human opening the PR is responsible for the di
 ## Downstream Consumers and Release Tooling
 
 - `action.yaml` / `get-compose-action/` define the GitHub Action that other Sentry repos use to run self-hosted E2E tests against their own images (relay, snuba, symbolicator, taskbroker, uptime-checker, vroom). Its inputs (`project_name`, `image_url`, `compose_profiles`, `skip_backup_restore_test`, …) are a public interface — do not rename or remove inputs without coordinating with those consumers, and keep default behavior backward compatible.
-- Releases are driven by [Craft](https://github.com/getsentry/craft) via `.craft.yml` (calver versioning): Craft runs `scripts/bump-version.sh` pre-release and `scripts/post-release.sh` post-release, and generates `CHANGELOG.md`. Do NOT hand-edit `CHANGELOG.md`, invoke those scripts manually, or hand-bump the `*_IMAGE` tags in `.env` — versioning belongs to the release pipeline.
+- Releases are driven by [Craft](https://github.com/getsentry/craft) via `.craft.yml` (calver versioning): Craft runs `scripts/bump-version.sh` to set the release version, runs it again after publishing to set `master` back to `nightly` (`postReleaseBump`), and generates `CHANGELOG.md`. Do NOT hand-edit `CHANGELOG.md`, invoke that script manually, or hand-bump the `*_IMAGE` tags in `.env` — versioning belongs to the release pipeline.
 
 ## Where Changes Belong
 
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 3514c5cca1a..03e750609b9 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -2,7 +2,7 @@
 set -eu
 
 # Craft passes versions via env vars (preferred) with positional args as fallback
-# for manual invocation (e.g. post-release.sh calls this with positional args).
+# for manual invocation.
 OLD_VERSION="${CRAFT_OLD_VERSION:-${1:-}}"
 NEW_VERSION="${CRAFT_NEW_VERSION:-${2:-}}"
 
diff --git a/scripts/post-release.sh b/scripts/post-release.sh
deleted file mode 100755
index f2e6a238d16..00000000000
--- a/scripts/post-release.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-# Bring master back to nightlies after merge from release branch
-git checkout master && git pull --rebase
-./scripts/bump-version.sh '' 'nightly'
-git diff --quiet || git commit -anm $'build: Set master version to nightly\n\n#skip-changelog' && git pull --rebase && git push