diff --git a/.env b/.env
index a73d4dd..2a80e2b 100644
--- a/.env
+++ b/.env
@@ -9,12 +9,12 @@ SENTRY_EVENT_RETENTION_DAYS=90
 SENTRY_BIND=9000
 # Set SENTRY_MAIL_HOST to a valid FQDN (host/domain name) to be able to send emails!
 # SENTRY_MAIL_HOST=example.com
-SENTRY_IMAGE=getsentry/sentry:nightly
-SNUBA_IMAGE=getsentry/snuba:nightly
-RELAY_IMAGE=getsentry/relay:nightly
-SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
-TASKBROKER_IMAGE=getsentry/taskbroker:nightly
-VROOM_IMAGE=getsentry/vroom:nightly
+SENTRY_IMAGE=getsentry/sentry:25.6.0
+SNUBA_IMAGE=getsentry/snuba:25.6.0
+RELAY_IMAGE=getsentry/relay:25.6.0
+SYMBOLICATOR_IMAGE=getsentry/symbolicator:25.6.0
+TASKBROKER_IMAGE=getsentry/taskbroker:25.6.0
+VROOM_IMAGE=getsentry/vroom:25.6.0
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=1m30s
 HEALTHCHECK_RETRIES=10
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d421410..1460ee3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 25.6.0
+
+### Various fixes & improvements
+
+- enable shell linter for more scripts (#3748) by @doc-sheet
+- feat: migrate to arm64-compatible smtp image (#3746) by @ezhevita
+- Introduce patches with external kafka (#3521) by @aldy505
+- add shellcheck action to lint bash scripts (#3710) by @doc-sheet
+- tests: Install version 2.x of Python SDK (#3745) by @sentrivana
+- feat(features): enable continuous profiling (#3742) by @aldy505
+- feat: Add taskbroker + worker + scheduler (#3738) by @markstory
+- fix(profiles): Run the profile chunks consumer (#3739) by @phacops
+- chore: prune removed feature flags on main repository (#3731) by @aldy505
+- remove index workaround (#3730) by @asottile-sentry
+- Make usage of Python SDK future proof (#3714) by @antonpirker
+
 ## 25.5.1
 
 ### Various fixes & improvements