diff --git a/CHANGELOG.md b/CHANGELOG.md
index d24f88748..f57468bfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,112 +2,51 @@
 
 All notable changes to this project will be documented in this file.
 
-## [8.13.0](https://github.com/openvoxproject/openvoxdb/tree/8.13.0) (2026-04-30)
+## [9.0.0-beta1](https://github.com/openvoxproject/openvoxdb/tree/9.0.0-beta1) (2026-07-14)
 
-[Full Changelog](https://github.com/openvoxproject/openvoxdb/compare/8.12.1...8.13.0)
+[Full Changelog](https://github.com/openvoxproject/openvoxdb/compare/8.13.0...9.0.0-beta1)
 
-**Implemented enhancements:**
-
-- \[Feature request\]: Migrate joda-time usage to java.time [\#217](https://github.com/OpenVoxProject/openvoxdb/issues/217)
-- Depend on latest openvox-agent packages [\#237](https://github.com/OpenVoxProject/openvoxdb/pull/237) ([bastelfreak](https://github.com/bastelfreak))
-- ezbake: Update 2.7.3-\>2.7.4 [\#236](https://github.com/OpenVoxProject/openvoxdb/pull/236) ([bastelfreak](https://github.com/bastelfreak))
-- Migrate from clj-time/Joda-Time to java.time [\#226](https://github.com/OpenVoxProject/openvoxdb/pull/226) ([austb](https://github.com/austb))
-
-**Merged pull requests:**
-
-- fix: include tarballs in snapshot artifact upload by matching on version [\#254](https://github.com/OpenVoxProject/openvoxdb/pull/254) ([slauger](https://github.com/slauger))
-- Add Ubuntu 26.04 to CI [\#235](https://github.com/OpenVoxProject/openvoxdb/pull/235) ([bastelfreak](https://github.com/bastelfreak))
-- remove clj-parent as it was archived [\#234](https://github.com/OpenVoxProject/openvoxdb/pull/234) ([corporate-gadfly](https://github.com/corporate-gadfly))
-- Refactor rewrite-service to eliminate redundant declaration of DummyProtocol [\#233](https://github.com/OpenVoxProject/openvoxdb/pull/233) ([corporate-gadfly](https://github.com/corporate-gadfly))
-- Add Podman compatibility to vox:build task [\#223](https://github.com/OpenVoxProject/openvoxdb/pull/223) ([Sharpie](https://github.com/Sharpie))
-- Update README to use OpenVoxDB instead of PuppetDB [\#191](https://github.com/OpenVoxProject/openvoxdb/pull/191) ([sebastianrakel](https://github.com/sebastianrakel))
-
-## [8.12.1](https://github.com/openvoxproject/openvoxdb/tree/8.12.1) (2026-01-23)
-
-[Full Changelog](https://github.com/openvoxproject/openvoxdb/compare/8.12.0...8.12.1)
-
-**Fixed bugs:**
-
-- \[Bug\]: /pdb/meta/v1/version returns empty string in version 8.12.0 [\#183](https://github.com/OpenVoxProject/openvoxdb/issues/183)
-
-**Merged pull requests:**
+**Breaking changes:**
 
-- Lookup version from openvox group namespace [\#184](https://github.com/OpenVoxProject/openvoxdb/pull/184) ([austb](https://github.com/austb))
-
-## [8.12.0](https://github.com/openvoxproject/openvoxdb/tree/8.12.0) (2026-01-23)
-
-[Full Changelog](https://github.com/openvoxproject/openvoxdb/compare/8.11.0...8.12.0)
+- CI: Stop building packages for Debian 11 & 12 [\#297](https://github.com/OpenVoxProject/openvoxdb/pull/297) ([bastelfreak](https://github.com/bastelfreak))
+- Drop Java 17 support [\#294](https://github.com/OpenVoxProject/openvoxdb/pull/294) ([bastelfreak](https://github.com/bastelfreak))
+- Upgrade to jetty12 [\#208](https://github.com/OpenVoxProject/openvoxdb/pull/208) ([austb](https://github.com/austb))
 
 **Implemented enhancements:**
 
-- Update Dockerfile for Java 17 and Ruby 3.2.9 [\#97](https://github.com/OpenVoxProject/openvoxdb/pull/97) ([bastelfreak](https://github.com/bastelfreak))
-- Add postgresql 18 testing [\#83](https://github.com/OpenVoxProject/openvoxdb/pull/83) ([austb](https://github.com/austb))
+- Add Java 25 support [\#291](https://github.com/OpenVoxProject/openvoxdb/pull/291) ([bastelfreak](https://github.com/bastelfreak))
 
 **Fixed bugs:**
 
-- \[Bug\]: openvoxdb 8.11.0-1+debian13 Trixie Package Java Dependency [\#76](https://github.com/OpenVoxProject/openvoxdb/issues/76)
-- \[Bug\]: openvoxdb 8.11.0-1+debian13 Trixie Package Java Dependency [\#75](https://github.com/OpenVoxProject/openvoxdb/issues/75)
-- \[Bug\]: Reports duplicate key value violates unique constraint error [\#16](https://github.com/OpenVoxProject/openvoxdb/issues/16)
+- Replace use of --configprint in ssl-setup [\#400](https://github.com/OpenVoxProject/openvoxdb/pull/400) ([Sharpie](https://github.com/Sharpie))
+- Fix Jolokia 2.x configuration [\#334](https://github.com/OpenVoxProject/openvoxdb/pull/334) ([Sharpie](https://github.com/Sharpie))
+- Download and isolate SLES RPM macros in /opt/suse-rpm-macros [\#300](https://github.com/OpenVoxProject/openvoxdb/pull/300) ([corporate-gadfly](https://github.com/corporate-gadfly))
 
-**Merged pull requests:**
+**Security fixes:**
 
-- Add FIPS release job and update project version machinery [\#182](https://github.com/OpenVoxProject/openvoxdb/pull/182) ([nmburgan](https://github.com/nmburgan))
-- Changes for FIPS [\#181](https://github.com/OpenVoxProject/openvoxdb/pull/181) ([nmburgan](https://github.com/nmburgan))
-- Downgrade ring-core to version 1.14.2 [\#178](https://github.com/OpenVoxProject/openvoxdb/pull/178) ([nmburgan](https://github.com/nmburgan))
-- Fix reflection errors [\#176](https://github.com/OpenVoxProject/openvoxdb/pull/176) ([austb](https://github.com/austb))
-- Update build comment if it already exists [\#169](https://github.com/OpenVoxProject/openvoxdb/pull/169) ([nmburgan](https://github.com/nmburgan))
-- Refactor Vox rake tasks [\#168](https://github.com/OpenVoxProject/openvoxdb/pull/168) ([nmburgan](https://github.com/nmburgan))
-- Fix int tests due to missing BC jars [\#166](https://github.com/OpenVoxProject/openvoxdb/pull/166) ([nmburgan](https://github.com/nmburgan))
-- Add annotations for GitHub for test failures [\#165](https://github.com/OpenVoxProject/openvoxdb/pull/165) ([nmburgan](https://github.com/nmburgan))
-- Add test summary for the end of lein test [\#164](https://github.com/OpenVoxProject/openvoxdb/pull/164) ([nmburgan](https://github.com/nmburgan))
-- Fixes for test task [\#159](https://github.com/OpenVoxProject/openvoxdb/pull/159) ([nmburgan](https://github.com/nmburgan))
-- CI: Properly detect if all jobs passed [\#158](https://github.com/OpenVoxProject/openvoxdb/pull/158) ([bastelfreak](https://github.com/bastelfreak))
-- Add vox:test task to run CI tests locally  [\#152](https://github.com/OpenVoxProject/openvoxdb/pull/152) ([nmburgan](https://github.com/nmburgan))
-- Move versions into managed deps and update openvox components [\#151](https://github.com/OpenVoxProject/openvoxdb/pull/151) ([nmburgan](https://github.com/nmburgan))
-- Remove clj-parent [\#111](https://github.com/OpenVoxProject/openvoxdb/pull/111) ([nmburgan](https://github.com/nmburgan))
-- Refactor lein profiles [\#110](https://github.com/OpenVoxProject/openvoxdb/pull/110) ([nmburgan](https://github.com/nmburgan))
-- CI: comment download link to PR [\#109](https://github.com/OpenVoxProject/openvoxdb/pull/109) ([bastelfreak](https://github.com/bastelfreak))
-- Fix transient failure in touch-parameters-test [\#106](https://github.com/OpenVoxProject/openvoxdb/pull/106) ([austb](https://github.com/austb))
-- CI: Add support for checking PR branches [\#103](https://github.com/OpenVoxProject/openvoxdb/pull/103) ([bastelfreak](https://github.com/bastelfreak))
-- Use shared release action [\#101](https://github.com/OpenVoxProject/openvoxdb/pull/101) ([bastelfreak](https://github.com/bastelfreak))
-- ezbake: Migrate from puppetlabs to openvoxproject & drop EL7 / Ubuntu 18.04 builds [\#99](https://github.com/OpenVoxProject/openvoxdb/pull/99) ([bastelfreak](https://github.com/bastelfreak))
-- Remove Java 11  [\#98](https://github.com/OpenVoxProject/openvoxdb/pull/98) ([bastelfreak](https://github.com/bastelfreak))
-- Update dependencies and namespace [\#96](https://github.com/OpenVoxProject/openvoxdb/pull/96) ([nmburgan](https://github.com/nmburgan))
-- Update report update condition to use report ID [\#80](https://github.com/OpenVoxProject/openvoxdb/pull/80) ([nmburgan](https://github.com/nmburgan))
-- \(maint\) Drop beaker parameters from beaker\_acceptance.yml call [\#79](https://github.com/OpenVoxProject/openvoxdb/pull/79) ([jpartlow](https://github.com/jpartlow))
-
-## [8.11.0](https://github.com/openvoxproject/openvoxdb/tree/8.11.0) (2025-08-24)
-
-[Full Changelog](https://github.com/openvoxproject/openvoxdb/compare/8.10.0...8.11.0)
+- Manage logback dependency [\#377](https://github.com/OpenVoxProject/openvoxdb/pull/377) ([Sharpie](https://github.com/Sharpie))
 
 **Merged pull requests:**
 
-- Fix for tag rake task [\#74](https://github.com/OpenVoxProject/openvoxdb/pull/74) ([nmburgan](https://github.com/nmburgan))
-- Allow override of ezbake version and fix ezbake ref passthrough [\#73](https://github.com/OpenVoxProject/openvoxdb/pull/73) ([nmburgan](https://github.com/nmburgan))
-- clj-parent: Switch from puppetlabs to our fork [\#70](https://github.com/OpenVoxProject/openvoxdb/pull/70) ([bastelfreak](https://github.com/bastelfreak))
-
-## [8.10.0](https://github.com/openvoxproject/openvoxdb/tree/8.10.0) (2025-08-04)
-
-[Full Changelog](https://github.com/openvoxproject/openvoxdb/compare/8.9.1...8.10.0)
-
-**Implemented enhancements:**
-
-- CI: Switch tests puppetlabs/puppetserver-\>OpenVoxProject/openvox-server [\#67](https://github.com/OpenVoxProject/openvoxdb/pull/67) ([bastelfreak](https://github.com/bastelfreak))
-- ezbake: Update 2.6.3-SNAPSHOT-openvox-\>3.0.1-SNAPSHOT [\#48](https://github.com/OpenVoxProject/openvoxdb/pull/48) ([bastelfreak](https://github.com/bastelfreak))
-- \(gh-21\) Enable acceptance testing [\#40](https://github.com/OpenVoxProject/openvoxdb/pull/40) ([jpartlow](https://github.com/jpartlow))
-- Remove update checking code [\#37](https://github.com/OpenVoxProject/openvoxdb/pull/37) ([smortex](https://github.com/smortex))
-- Remove the update link from the dashboard [\#36](https://github.com/OpenVoxProject/openvoxdb/pull/36) ([corporate-gadfly](https://github.com/corporate-gadfly))
-- Add JDK21 to CI [\#35](https://github.com/OpenVoxProject/openvoxdb/pull/35) ([bastelfreak](https://github.com/bastelfreak))
-- CI: Add Ruby 3.3 & 3.4 [\#29](https://github.com/OpenVoxProject/openvoxdb/pull/29) ([bastelfreak](https://github.com/bastelfreak))
-- Switch from puppet to openvox gem [\#26](https://github.com/OpenVoxProject/openvoxdb/pull/26) ([bastelfreak](https://github.com/bastelfreak))
-- puppetdb-terminus: migrate to openvoxdb-terminus [\#24](https://github.com/OpenVoxProject/openvoxdb/pull/24) ([bastelfreak](https://github.com/bastelfreak))
-- Switch from facter to openfact [\#23](https://github.com/OpenVoxProject/openvoxdb/pull/23) ([bastelfreak](https://github.com/bastelfreak))
-- Rework CI config to match current standards [\#15](https://github.com/OpenVoxProject/openvoxdb/pull/15) ([bastelfreak](https://github.com/bastelfreak))
-- Add JMX warning [\#13](https://github.com/OpenVoxProject/openvoxdb/pull/13) ([nmburgan](https://github.com/nmburgan))
-
-**Fixed bugs:**
-
-- \[Bug\]: Release artifacts for openvoxdb 8.9.1 have been overwritten [\#31](https://github.com/OpenVoxProject/openvoxdb/issues/31)
+- Build JARs with Java version based on branch [\#410](https://github.com/OpenVoxProject/openvoxdb/pull/410) ([Sharpie](https://github.com/Sharpie))
+- Update integration tests to expect Ruby 3.4 output [\#409](https://github.com/OpenVoxProject/openvoxdb/pull/409) ([Sharpie](https://github.com/Sharpie))
+- add badge for daily build status [\#408](https://github.com/OpenVoxProject/openvoxdb/pull/408) ([corporate-gadfly](https://github.com/corporate-gadfly))
+- acceptance: Run tests against Postgres 17 [\#406](https://github.com/OpenVoxProject/openvoxdb/pull/406) ([Sharpie](https://github.com/Sharpie))
+- Bump beaker version to 7.6 [\#404](https://github.com/OpenVoxProject/openvoxdb/pull/404) ([Sharpie](https://github.com/Sharpie))
+- add special cases to main workflow [\#378](https://github.com/OpenVoxProject/openvoxdb/pull/378) ([corporate-gadfly](https://github.com/corporate-gadfly))
+- Downgrade logstash-logback-encoder 9.0-\>8.1 [\#360](https://github.com/OpenVoxProject/openvoxdb/pull/360) ([Sharpie](https://github.com/Sharpie))
+- Addutional FIPS DRBG \(deterministic random bit generator\) limit changes [\#344](https://github.com/OpenVoxProject/openvoxdb/pull/344) ([jpartlow](https://github.com/jpartlow))
+- Fix FIPS-safe random string generation in dataset generator [\#343](https://github.com/OpenVoxProject/openvoxdb/pull/343) ([corporate-gadfly](https://github.com/corporate-gadfly))
+- fix FIPS tests by using correct path to java.security.fips [\#342](https://github.com/OpenVoxProject/openvoxdb/pull/342) ([corporate-gadfly](https://github.com/corporate-gadfly))
+- fix engine tests [\#331](https://github.com/OpenVoxProject/openvoxdb/pull/331) ([corporate-gadfly](https://github.com/corporate-gadfly))
+- Remove stale documentation/CONTRIBUTING.md, refresh stale README links [\#304](https://github.com/OpenVoxProject/openvoxdb/pull/304) ([miharp](https://github.com/miharp))
+- Replace java-21-openjdk-devel-\>java-21-openjdk-headless [\#301](https://github.com/OpenVoxProject/openvoxdb/pull/301) ([corporate-gadfly](https://github.com/corporate-gadfly))
+- feat: simplify container build by using ADD, list packages more readable [\#298](https://github.com/OpenVoxProject/openvoxdb/pull/298) ([rwaffen](https://github.com/rwaffen))
+- Docker: Switch to Java 21 [\#296](https://github.com/OpenVoxProject/openvoxdb/pull/296) ([bastelfreak](https://github.com/bastelfreak))
+- Use Ruby 4 for builder image and cache it [\#279](https://github.com/OpenVoxProject/openvoxdb/pull/279) ([nmburgan](https://github.com/nmburgan))
+-  Migrate config to use trapperkeeper-webserver [\#271](https://github.com/OpenVoxProject/openvoxdb/pull/271) ([nmburgan](https://github.com/nmburgan))
+- Update acceptance descriptions and defaults for OpenVox 9 [\#268](https://github.com/OpenVoxProject/openvoxdb/pull/268) ([nmburgan](https://github.com/nmburgan))
+- Target openvox9 platform for main branch [\#267](https://github.com/OpenVoxProject/openvoxdb/pull/267) ([nmburgan](https://github.com/nmburgan))
 
 ## 8.9.1
 
diff --git a/project.clj b/project.clj
index aa1483bb8..ec4251f50 100644
--- a/project.clj
+++ b/project.clj
@@ -107,7 +107,7 @@
 
 ;; If you modify the version manually, run release_scripts/sync_ezbake_dep.rb to keep
 ;; the ezbake dependency in sync.
-(defproject org.openvoxproject/puppetdb "9.0.0-SNAPSHOT"
+(defproject org.openvoxproject/puppetdb "9.0.0-beta1-SNAPSHOT"
   :description "OpenVox-integrated catalog and fact storage"
 
   :license {:name "Apache License, Version 2.0"
@@ -379,7 +379,7 @@
                                       ;;
                                       ;; Do not modify this line. It is managed by the release process
                                       ;; via the release_scripts/sync_ezbake_dep.rb script.
-                                      [org.openvoxproject/puppetdb "9.0.0-SNAPSHOT"]]
+                                      [org.openvoxproject/puppetdb "9.0.0-beta1-SNAPSHOT"]]
               :name "puppetdb"
               :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.8.0")]]}
     :ezbake-fips {:dependencies ^:replace [[org.bouncycastle/bcpkix-fips]
@@ -388,7 +388,7 @@
                                            [org.clojure/clojure]
                                            ;; Do not modify this line. It is managed by the release process
                                            ;; via the release_scripts/sync_ezbake_dep.rb script.
-                                           [org.openvoxproject/puppetdb "9.0.0-SNAPSHOT"]]
+                                           [org.openvoxproject/puppetdb "9.0.0-beta1-SNAPSHOT"]]
               :name "puppetdb"
               :uberjar-exclusions [#"^org/bouncycastle/.*"]
               :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.8.0")]]}
diff --git a/rakelib/changelog.rake b/rakelib/changelog.rake
index f0b79d11e..d06d66caa 100644
--- a/rakelib/changelog.rake
+++ b/rakelib/changelog.rake
@@ -19,10 +19,9 @@ else
     config.future_release = File.readlines('project.clj')
       .grep(/^\(defproject /).first[/"([^"]+)"/, 1]
       .sub(/-SNAPSHOT\z/, '')
-    # we limit the changelog to all new openvox releases, to skip perforce onces
-    # otherwise the changelog generate takes a lot amount of time
-    config.since_tag = '8.9.1'
-    #config.exclude_tags_regex = /\A7\./
+    # OpenVox 9.x branched after the 8.13.0 release.
+    config.since_tag = '8.13.0'
+    config.include_tags_regex = /\A8\.13\.0|\A9\./
     config.release_branch = 'main'
   end
 end