diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d5d306a..e1caac29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [25.104.0-M1] - 2026-06-10
+### Changed
+- Updated parent `cpp-platform-maven-parent-pom` to `25.104.0-M1`
+- Updated `framework.version` (`cp-microservice-framework`) to `25.104.0-M1`
+- Updated `framework-libraries.version` (`cp-framework-libraries`) to `25.104.0-M6`
+- Updated `event-store.version` (`cp-event-store`) to `25.104.0-M1`
+- Updated `file-service.version` (`cp-file-service`) to `25.104.0-M3`
+
 ## [21.0.0-SNAPSHOT] - 2026-04-14
 ### Changed
 - Bumped version to `21.0.0-SNAPSHOT` for Java 21 / WildFly 34 migration
diff --git a/access-control-parent/access-control-drools/pom.xml b/access-control-parent/access-control-drools/pom.xml
index d41fdef9..9d36f991 100644
--- a/access-control-parent/access-control-drools/pom.xml
+++ b/access-control-parent/access-control-drools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-parent</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-drools</artifactId>
diff --git a/access-control-parent/access-control-providers/access-control-assignment-providers/pom.xml b/access-control-parent/access-control-providers/access-control-assignment-providers/pom.xml
index 11f6fc56..2dc43b88 100644
--- a/access-control-parent/access-control-providers/access-control-assignment-providers/pom.xml
+++ b/access-control-parent/access-control-providers/access-control-assignment-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-providers</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-assignment-providers</artifactId>
@@ -22,6 +22,11 @@
                         <version>${javaee-api.version}</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.assignment</groupId>
                         <artifactId>assignment-query-api</artifactId>
diff --git a/access-control-parent/access-control-providers/access-control-common-providers/pom.xml b/access-control-parent/access-control-providers/access-control-common-providers/pom.xml
index 1590010e..b1f07d7c 100644
--- a/access-control-parent/access-control-providers/access-control-common-providers/pom.xml
+++ b/access-control-parent/access-control-providers/access-control-common-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-providers</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-common-providers</artifactId>
@@ -39,6 +39,11 @@
                         <version>${javaee-api.version}</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>
diff --git a/access-control-parent/access-control-providers/access-control-hearing-providers/pom.xml b/access-control-parent/access-control-providers/access-control-hearing-providers/pom.xml
index fb4e654d..71b67b93 100644
--- a/access-control-parent/access-control-providers/access-control-hearing-providers/pom.xml
+++ b/access-control-parent/access-control-providers/access-control-hearing-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-providers</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-hearing-providers</artifactId>
@@ -22,6 +22,11 @@
                         <version>${javaee-api.version}</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.hearing</groupId>
                         <artifactId>hearing-query-api</artifactId>
diff --git a/access-control-parent/access-control-providers/access-control-progression-providers/pom.xml b/access-control-parent/access-control-providers/access-control-progression-providers/pom.xml
index 3a1f3d7e..5443bab8 100644
--- a/access-control-parent/access-control-providers/access-control-progression-providers/pom.xml
+++ b/access-control-parent/access-control-providers/access-control-progression-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-providers</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-progression-providers</artifactId>
@@ -22,6 +22,11 @@
                         <version>${javaee-api.version}</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.progression</groupId>
                         <artifactId>progression-query-api</artifactId>
diff --git a/access-control-parent/access-control-providers/access-control-refdata-providers/pom.xml b/access-control-parent/access-control-providers/access-control-refdata-providers/pom.xml
index f86bb161..50b1740c 100644
--- a/access-control-parent/access-control-providers/access-control-refdata-providers/pom.xml
+++ b/access-control-parent/access-control-providers/access-control-refdata-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-providers</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-refdata-providers</artifactId>
@@ -26,6 +26,11 @@
                         <version>${javaee-api.version}</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.referencedata</groupId>
                         <artifactId>referencedata-query-api</artifactId>
diff --git a/access-control-parent/access-control-providers/access-control-sjp-providers/pom.xml b/access-control-parent/access-control-providers/access-control-sjp-providers/pom.xml
index 0b99f1af..f3a6f764 100644
--- a/access-control-parent/access-control-providers/access-control-sjp-providers/pom.xml
+++ b/access-control-parent/access-control-providers/access-control-sjp-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-providers</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-sjp-providers</artifactId>
@@ -22,6 +22,11 @@
                         <version>${javaee-api.version}</version>
                         <scope>runtime</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.xml.bind-api.raml.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.moj.cpp.sjp</groupId>
                         <artifactId>sjp-query-api</artifactId>
diff --git a/access-control-parent/access-control-providers/pom.xml b/access-control-parent/access-control-providers/pom.xml
index 44c30c1f..fff3b1ac 100644
--- a/access-control-parent/access-control-providers/pom.xml
+++ b/access-control-parent/access-control-providers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-parent</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-providers</artifactId>
diff --git a/access-control-parent/access-control-test-utils/pom.xml b/access-control-parent/access-control-test-utils/pom.xml
index 24e8f1e4..5f07f194 100644
--- a/access-control-parent/access-control-test-utils/pom.xml
+++ b/access-control-parent/access-control-test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.access-control</groupId>
         <artifactId>access-control-parent</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>access-control-test-utils</artifactId>
diff --git a/access-control-parent/pom.xml b/access-control-parent/pom.xml
index e1fb9965..51711500 100644
--- a/access-control-parent/pom.xml
+++ b/access-control-parent/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.access-control</groupId>
diff --git a/activiti-parent/activiti-embedded-rest-example/pom.xml b/activiti-parent/activiti-embedded-rest-example/pom.xml
index f621a4f5..1df45471 100644
--- a/activiti-parent/activiti-embedded-rest-example/pom.xml
+++ b/activiti-parent/activiti-embedded-rest-example/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>activiti-parent</artifactId>
         <groupId>uk.gov.moj.cpp.activiti</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/activiti-parent/activiti-embedded-rest/pom.xml b/activiti-parent/activiti-embedded-rest/pom.xml
index fe27bd4f..a90fd938 100644
--- a/activiti-parent/activiti-embedded-rest/pom.xml
+++ b/activiti-parent/activiti-embedded-rest/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>activiti-parent</artifactId>
         <groupId>uk.gov.moj.cpp.activiti</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/activiti-parent/pom.xml b/activiti-parent/pom.xml
index ffcb7160..c6f4b7f8 100644
--- a/activiti-parent/pom.xml
+++ b/activiti-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.activiti</groupId>
diff --git a/audit-library-parent/audit-client/pom.xml b/audit-library-parent/audit-client/pom.xml
index d4122007..51205809 100644
--- a/audit-library-parent/audit-client/pom.xml
+++ b/audit-library-parent/audit-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>audit-library-parent</artifactId>
         <groupId>uk.gov.moj.cpp.audit</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/audit-library-parent/pom.xml b/audit-library-parent/pom.xml
index 3c3f6ef8..0379e188 100644
--- a/audit-library-parent/pom.xml
+++ b/audit-library-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.audit</groupId>
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 4944e640..9018c01e 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -22,7 +22,7 @@ resources:
 pool:
   name: "MDV-ADO-AGENT-AKS-01"
   demands:
-    - identifier -equals ubuntu-j21
+    - identifier -equals ubuntu-j25-postgres
 
 variables:
   sonarqubeProject: "uk.gov.moj.platform.libraries:platform-libraries-parent-pom"
diff --git a/cpp-platform-library-utils/cpp-platform-azure-utils/pom.xml b/cpp-platform-library-utils/cpp-platform-azure-utils/pom.xml
index bc3a09b6..2796e6bd 100644
--- a/cpp-platform-library-utils/cpp-platform-azure-utils/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-azure-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
         <artifactId>cpp-platform-library-utils</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-persistence/pom.xml b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-persistence/pom.xml
index dc6db940..6400a902 100644
--- a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-persistence/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-persistence/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
         <artifactId>cpp-platform-data-utils</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cpp-platform-data-utils-persistence</artifactId>
diff --git a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-rest/pom.xml b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-rest/pom.xml
index 11ae64ca..b50a6b76 100644
--- a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-rest/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-rest/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
         <artifactId>cpp-platform-data-utils</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-service/pom.xml b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-service/pom.xml
index d1963b04..6368f0df 100644
--- a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-service/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
         <artifactId>cpp-platform-data-utils</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cpp-platform-data-utils-service</artifactId>
diff --git a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-test-utils/pom.xml b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-test-utils/pom.xml
index 7490cd07..39c6b30a 100644
--- a/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-test-utils/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-data-utils/cpp-platform-data-utils-test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
         <artifactId>cpp-platform-data-utils</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cpp-platform-data-utils-test-utils</artifactId>
diff --git a/cpp-platform-library-utils/cpp-platform-data-utils/pom.xml b/cpp-platform-library-utils/cpp-platform-data-utils/pom.xml
index d23eab6b..ae554236 100644
--- a/cpp-platform-library-utils/cpp-platform-data-utils/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-data-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
         <artifactId>cpp-platform-library-utils</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cpp-platform-data-utils</artifactId>
diff --git a/cpp-platform-library-utils/cpp-platform-test-utils/pom.xml b/cpp-platform-library-utils/cpp-platform-test-utils/pom.xml
index 27074de2..d3d62660 100644
--- a/cpp-platform-library-utils/cpp-platform-test-utils/pom.xml
+++ b/cpp-platform-library-utils/cpp-platform-test-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cpp-platform-library-utils</artifactId>
         <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cpp-platform-library-utils/pom.xml b/cpp-platform-library-utils/pom.xml
index 810c1d58..26813867 100644
--- a/cpp-platform-library-utils/pom.xml
+++ b/cpp-platform-library-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.common.library.utils</groupId>
diff --git a/feature-control/pom.xml b/feature-control/pom.xml
index 737d0df6..1ff9188c 100644
--- a/feature-control/pom.xml
+++ b/feature-control/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>platform-libraries-parent-pom</artifactId>
         <groupId>uk.gov.moj.platform.libraries</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/healthchecks-parent/pom.xml b/healthchecks-parent/pom.xml
index 53d39ac7..98f71038 100644
--- a/healthchecks-parent/pom.xml
+++ b/healthchecks-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.healthchecks</groupId>
diff --git a/healthchecks-parent/unifiedsearch-healthchecks/pom.xml b/healthchecks-parent/unifiedsearch-healthchecks/pom.xml
index 1d04f09b..33621dce 100644
--- a/healthchecks-parent/unifiedsearch-healthchecks/pom.xml
+++ b/healthchecks-parent/unifiedsearch-healthchecks/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.healthchecks</groupId>
         <artifactId>healthchecks-parent</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/healthchecks-parent/workmanagement-healthchecks/pom.xml b/healthchecks-parent/workmanagement-healthchecks/pom.xml
index 3686dc58..52768350 100644
--- a/healthchecks-parent/workmanagement-healthchecks/pom.xml
+++ b/healthchecks-parent/workmanagement-healthchecks/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.healthchecks</groupId>
         <artifactId>healthchecks-parent</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/id-mapper-client/pom.xml b/id-mapper-client/pom.xml
index 697aa74f..149277be 100644
--- a/id-mapper-client/pom.xml
+++ b/id-mapper-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.system.id-mapper</groupId>
diff --git a/metrics-micrometer/pom.xml b/metrics-micrometer/pom.xml
index c5d9f02e..43ae6ed7 100644
--- a/metrics-micrometer/pom.xml
+++ b/metrics-micrometer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>metrics-micrometer</artifactId>
diff --git a/platform-libraries-bom/pom.xml b/platform-libraries-bom/pom.xml
index 2ab963f8..92bc4a67 100644
--- a/platform-libraries-bom/pom.xml
+++ b/platform-libraries-bom/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 621adec9..427107e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1</version>
     </parent>
 
     <groupId>uk.gov.moj.platform.libraries</groupId>
     <artifactId>platform-libraries-parent-pom</artifactId>
     <name>cpp.platform.libraries</name>
-    <version>21.0.0-M1-SNAPSHOT</version>
+    <version>25.104.0-M1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -37,16 +37,20 @@
             2. While release through ADO pipeline, for white listed release branches (main/release-8.x.x) it's done through git hook (legacy solution) via azure pipeline code
             3. While release through ADO pipeline, for branches other than white listed release branches, it's done through versions:set command via azure pipeline code
          -->
-        <cpp.platform-libraries.version>21.0.0-M1-SNAPSHOT</cpp.platform-libraries.version>
+        <cpp.platform-libraries.version>25.104.0-M1-SNAPSHOT</cpp.platform-libraries.version>
+        <!-- 0.8.12 (parent-pom M1) cannot instrument Java 25 class files (major version 69); override until parent-pom M2 -->
+        <plugins.jacoco.version>0.8.14</plugins.jacoco.version>
+        <!-- Pinned to pre-EE9 version: rest-client-generator-plugin uses javax.xml.bind.* (via raml-parser) which is only present in jakarta.xml.bind-api 2.x. DO NOT upgrade. -->
+        <jakarta.xml.bind-api.raml.version>2.3.2</jakarta.xml.bind-api.raml.version>
 
         <!-- Github libraries versions -->
-        <cpp.common-bom.version>21.0.0-M1-SNAPSHOT</cpp.common-bom.version>
-        <file-service.version>21.0.0-M1-SNAPSHOT</file-service.version>
+        <cpp.common-bom.version>25.104.0-M1</cpp.common-bom.version>
+        <file-service.version>25.104.0-M3</file-service.version>
 
         <!-- Framework versions -->
-        <framework-libraries.version>21.0.0-M1-SNAPSHOT</framework-libraries.version>
-        <framework.version>21.0.0-M1-SNAPSHOT</framework.version>
-        <event-store.version>21.0.0-M1-SNAPSHOT</event-store.version>
+        <framework-libraries.version>25.104.0-M6</framework-libraries.version>
+        <framework.version>25.104.0-M1</framework.version>
+        <event-store.version>25.104.0-M1</event-store.version>
 
         <cpp.framework.version>${framework.version}</cpp.framework.version>
 
@@ -95,21 +99,49 @@
                     <groupId>uk.gov.justice.framework-generators</groupId>
                     <artifactId>direct-client-generator-plugin</artifactId>
                     <version>${framework.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
+                            <version>${jakarta.xml.bind-api.raml.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>uk.gov.justice.framework-generators</groupId>
                     <artifactId>rest-client-generator-plugin</artifactId>
                     <version>${framework.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
+                            <version>${jakarta.xml.bind-api.raml.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>uk.gov.justice.framework-generators</groupId>
                     <artifactId>rest-adapter-generator-plugin</artifactId>
                     <version>${framework.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
+                            <version>${jakarta.xml.bind-api.raml.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>uk.gov.justice.framework-generators</groupId>
                     <artifactId>unifiedsearch-client-generator-plugin</artifactId>
                     <version>${framework.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
+                            <version>${jakarta.xml.bind-api.raml.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <artifactId>pojo-generation-plugin</artifactId>
diff --git a/service-components/command/command-api/pom.xml b/service-components/command/command-api/pom.xml
index 012b7540..1134a2fe 100644
--- a/service-components/command/command-api/pom.xml
+++ b/service-components/command/command-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>command</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/command/command-controller/pom.xml b/service-components/command/command-controller/pom.xml
index 8da2da2e..435afd2c 100644
--- a/service-components/command/command-controller/pom.xml
+++ b/service-components/command/command-controller/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>command</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/command/command-handler/pom.xml b/service-components/command/command-handler/pom.xml
index 929649cd..028eafeb 100644
--- a/service-components/command/command-handler/pom.xml
+++ b/service-components/command/command-handler/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>command</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/command/pom.xml b/service-components/command/pom.xml
index 3c6563f8..40949ce3 100644
--- a/service-components/command/pom.xml
+++ b/service-components/command/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>service-components</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/service-components/event/event-api/pom.xml b/service-components/event/event-api/pom.xml
index 9c3433b4..d5cd0854 100644
--- a/service-components/event/event-api/pom.xml
+++ b/service-components/event/event-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>event</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/event/event-indexer/pom.xml b/service-components/event/event-indexer/pom.xml
index 18cdab33..16169785 100644
--- a/service-components/event/event-indexer/pom.xml
+++ b/service-components/event/event-indexer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>event</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/service-components/event/event-listener/pom.xml b/service-components/event/event-listener/pom.xml
index 4bdf13f8..701c83f5 100644
--- a/service-components/event/event-listener/pom.xml
+++ b/service-components/event/event-listener/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>event</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/event/event-processor/pom.xml b/service-components/event/event-processor/pom.xml
index a54d252b..93adad3f 100644
--- a/service-components/event/event-processor/pom.xml
+++ b/service-components/event/event-processor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>event</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/event/pom.xml b/service-components/event/pom.xml
index f8385e7e..f2603121 100644
--- a/service-components/event/pom.xml
+++ b/service-components/event/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>service-components</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/service-components/pom.xml b/service-components/pom.xml
index 95938099..3cbd9e5b 100644
--- a/service-components/pom.xml
+++ b/service-components/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/service-components/query/pom.xml b/service-components/query/pom.xml
index 3d06eae7..2a4dadd2 100644
--- a/service-components/query/pom.xml
+++ b/service-components/query/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>service-components</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/service-components/query/query-api/pom.xml b/service-components/query/query-api/pom.xml
index 3d111ad8..5da51cf9 100644
--- a/service-components/query/query-api/pom.xml
+++ b/service-components/query/query-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>query</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/query/query-controller/pom.xml b/service-components/query/query-controller/pom.xml
index 756ecae4..e13bc2b1 100644
--- a/service-components/query/query-controller/pom.xml
+++ b/service-components/query/query-controller/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>query</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/query/query-view/pom.xml b/service-components/query/query-view/pom.xml
index cc500fa7..2c0b3109 100644
--- a/service-components/query/query-view/pom.xml
+++ b/service-components/query/query-view/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>query</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/service-components/service-component-config/pom.xml b/service-components/service-component-config/pom.xml
index 2bf3e7bf..ba2cb79b 100644
--- a/service-components/service-component-config/pom.xml
+++ b/service-components/service-component-config/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>service-components</artifactId>
         <groupId>uk.gov.moj.cpp.common</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/system-documentgenerator-client/pom.xml b/system-documentgenerator-client/pom.xml
index 79ec29a2..a0c02755 100644
--- a/system-documentgenerator-client/pom.xml
+++ b/system-documentgenerator-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.system.documentgenerator</groupId>
diff --git a/system-users-library/pom.xml b/system-users-library/pom.xml
index ef74c96c..64e51e57 100644
--- a/system-users-library/pom.xml
+++ b/system-users-library/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.common</groupId>
diff --git a/unifiedsearch-library-parent/pom.xml b/unifiedsearch-library-parent/pom.xml
index 8ee2bb3c..663f259a 100644
--- a/unifiedsearch-library-parent/pom.xml
+++ b/unifiedsearch-library-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.platform.libraries</groupId>
         <artifactId>platform-libraries-parent-pom</artifactId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.unifiedsearch</groupId>
diff --git a/unifiedsearch-library-parent/unifiedsearch-client/pom.xml b/unifiedsearch-library-parent/unifiedsearch-client/pom.xml
index f0028b33..aa88d598 100644
--- a/unifiedsearch-library-parent/unifiedsearch-client/pom.xml
+++ b/unifiedsearch-library-parent/unifiedsearch-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>unifiedsearch-library-parent</artifactId>
         <groupId>uk.gov.moj.cpp.unifiedsearch</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/unifiedsearch-library-parent/unifiedsearch-test-utils/pom.xml b/unifiedsearch-library-parent/unifiedsearch-test-utils/pom.xml
index dde52ee1..2dc28eed 100644
--- a/unifiedsearch-library-parent/unifiedsearch-test-utils/pom.xml
+++ b/unifiedsearch-library-parent/unifiedsearch-test-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>unifiedsearch-library-parent</artifactId>
         <groupId>uk.gov.moj.cpp.unifiedsearch</groupId>
-        <version>21.0.0-M1-SNAPSHOT</version>
+        <version>25.104.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>