diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc4a263b4..a8d6f7ad9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 - Update to Spring Framework 6
   - BREAKING CHANGE: Support for Java 11 is dropped
   - BREAKING CHANGE: Migrated from `javax` namespace to `jakarta` namespace
-  - Lot of dependency updates related to `jakarta` changes
+  - Lot of dependency updates/changes related to `jakarta` changes
     - Guice 7.0.0
     - Jersey 3.1.3
     - Jetty 11.0.15
@@ -20,48 +20,6 @@
     - Inject API to jakarta version 2.0.1
     - Jaxb API to jakarta bind-api 4.0.0
     - WS RS API to jakarta 3.1.0
-- `nflow-netty`
-  - POTENTIALLY BREAKING CHANGE: Netty configuration might need `Jackson2ObjectMapperBuilder` to have `findModulesViaServiceLoader` enabled as joda time module is not in wellknown modules anymore
-
-*Other dependency updates*
-- Commons lang3 3.13.0
-- H2 2.2.220
-- Jackson 2.15.2
-- Joda-time 2.12.5
-- Junit5 5.10.0
-- MariaDB 3.1.2
-- MSSQL 12.4.0-jre11
-- MySQL 8.1.0
-- OJDBC 23.2.0.0
-- PostgreSQL 42.6.0
-- Reactor core 3.5.9
-- Reactor netty 1.1.10
-- SLF4J 2.0.7
-- Swagger 2.2.15
-
-*Maven build plugin updates*
-- Clean plugin 3.3.1
-- Deploy plugin 3.1.1
-- Download plugin 1.7.1
-- Enforcer plugin 3.3.0
-- GPG plugin 3.1.0
-- Install plugin 3.1.1
-- Jacoco plugin 0.8.10
-- PMD plugin 3.21.0
-- Project info plugin 3.4.5
-- Release plugin 3.0.1
-- Resources plugin 3.3.1
-- Shade plugin 3.5.0
-- Site plugin 4.0.0-M9
-- Source plugin 3.3.0
-- Surefire plugin 3.1.2
-- Spotbugs plugin 4.7.3.5
-- Versions plugin 2.16.0
-
-## 8.0.1-SNAPSHOT (future release)
-
-**Highlights**
-
 - `nflow-engine`
   - POTENTIALLY BREAKING CHANGE: Add support to manage workflow instances without having the workflow implementation classes in the classpath.
   - Clean up old workflow executors that have expired configured time ago (default 1 year).
@@ -71,6 +29,8 @@
   - Include generated mariadb.create.ddl.sql in sources.jar.
 - `nflow-metrics`
   - export the nflow.database.type as a metric
+- `nflow-netty`
+  - POTENTIALLY BREAKING CHANGE: Netty configuration might need `Jackson2ObjectMapperBuilder` to have `findModulesViaServiceLoader` enabled as joda time module is not in wellknown modules anymore
 
 **Details**
 
@@ -99,41 +59,66 @@
   - Remove obsolete mysql legacy ddl sql scripts.
   - Include generated mariadb.create.ddl.sql in sources.jar.
   - Added tests against Oracle now that there is a working docker image of Oracle XE
-  - Dependency updates
-    - apache cxf 3.5.5
-    - jackson 2.14.2
-    - javassit 3.29.2
-    - jodatime 2.12.2
-    - logback-classic 1.4.6
-    - slf4j 2.0.6
-- `nflow-jetty`
-  - Dependency updates
-    - jetty 10.0.14
-- `nflow-netty`
-  - Dependency updates
-    - reactor-core 3.5.1
-    - reactor-netty 1.1.5
 - `nflow-rest-api`
   - Remove `@Primary` annotation from `nflowRestObjectMapper` in `RestConfiguration` to allow overriding default mapper. Spring Boot applications may need to define the mapper explicitly now.
-  - Dependency updates
-    - swagger 2.2.8
 - `nflow-metrics`
   - export the nflow.database.type as a metric
-  - Dependency updates
-    - metrics 4.2.17
-- `nflow-tests`
-  - Dependency updates
-    - h2 2.1.214
-    - mariadb 3.1.2
-    - postgresql 42.5.4
-    - mssql 12.2.0
-    - ojdbc 21.9.0.0
+- `nflow-netty`
+  - POTENTIALLY BREAKING CHANGE: `Jackson2ObjectMapperBuilder` might need configuration for jodatime
+    - Spring Framework 6 doesn't have Joda time module in wellknown anymore, so might need to configure `findModulesViaServiceLoader` to enable it (or some other way)
 - `nflow-explorer-ng`
   - Improved formatting timestamps
   - Fix retry on endpoint change
   - Fix querying with parent instance id
   - Fix loading custom instance content for child workflow
   - Fix state variables showing false values
+- Dependency updates
+  - Guice 7.0.0
+  - Jersey 3.1.3
+  - Jetty 11.0.15
+  - Apache CFX 4.0.2
+  - Dropwizard metrics 4.2.19
+  - Hibernate validator 8.0.1.Final
+  - Annotation API to jakarta version 2.1.1
+  - Servlet API to jakarta version 6.0.0
+  - Glassfish EL to jakarta version 4.0.2
+  - Inject API to jakarta version 2.0.1
+  - Jaxb API to jakarta bind-api 4.0.0
+  - WS RS API to jakarta 3.1.0
+  - javassit 3.29.2
+  - logback-classic 1.4.6
+  - Commons lang3 3.13.0
+  - H2 2.2.220
+  - Jackson 2.15.2
+  - Joda-time 2.12.5
+  - Junit5 5.10.0
+  - MariaDB 3.1.2
+  - MSSQL 12.4.0-jre11
+  - MySQL 8.1.0
+  - OJDBC 23.2.0.0
+  - PostgreSQL 42.6.0
+  - Reactor core 3.5.9
+  - Reactor netty 1.1.10
+  - SLF4J 2.0.7
+  - Swagger 2.2.15
+- Maven build plugin updates
+  - Clean plugin 3.3.1
+  - Deploy plugin 3.1.1
+  - Download plugin 1.7.1
+  - Enforcer plugin 3.3.0
+  - GPG plugin 3.1.0
+  - Install plugin 3.1.1
+  - Jacoco plugin 0.8.10
+  - PMD plugin 3.21.0
+  - Project info plugin 3.4.5
+  - Release plugin 3.0.1
+  - Resources plugin 3.3.1
+  - Shade plugin 3.5.0
+  - Site plugin 4.0.0-M9
+  - Source plugin 3.3.0
+  - Surefire plugin 3.1.2
+  - Spotbugs plugin 4.7.3.5
+  - Versions plugin 2.16.0
 
 ## 8.0.0 (2022-06-09)