diff --git a/example-context/example-service/example-command/example-command-handler/pom.xml b/example-context/example-service/example-command/example-command-handler/pom.xml
index f915ced8..e207ab8b 100644
--- a/example-context/example-service/example-command/example-command-handler/pom.xml
+++ b/example-context/example-service/example-command/example-command-handler/pom.xml
@@ -75,9 +75,9 @@
             <version>${event-store.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.framework-domain</groupId>
+            <groupId>uk.gov.justice.services</groupId>
             <artifactId>aggregate</artifactId>
-            <version>${framework-domain.version}</version>
+            <version>${framework.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/example-context/example-service/example-event/example-event-listener/pom.xml b/example-context/example-service/example-event/example-event-listener/pom.xml
index 1c0eb964..41cb51c2 100644
--- a/example-context/example-service/example-event/example-event-listener/pom.xml
+++ b/example-context/example-service/example-event/example-event-listener/pom.xml
@@ -57,9 +57,9 @@
             <version>${event-store.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>event-listener-interceptors</artifactId>
-            <version>${event-store.version}</version>
+            <groupId>uk.gov.justice.framework-api</groupId>
+            <artifactId>framework-api-event-listener-interceptors</artifactId>
+            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
@@ -76,6 +76,11 @@
             <artifactId>example-domain</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.event-store</groupId>
+            <artifactId>event-buffer-core</artifactId>
+            <version>${event-store.version}</version>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
diff --git a/example-context/example-service/example-event/other-event-listener/pom.xml b/example-context/example-service/example-event/other-event-listener/pom.xml
index 81a83653..20184e56 100644
--- a/example-context/example-service/example-event/other-event-listener/pom.xml
+++ b/example-context/example-service/example-event/other-event-listener/pom.xml
@@ -52,9 +52,9 @@
             <version>${event-store.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>event-listener-interceptors</artifactId>
-            <version>${event-store.version}</version>
+            <groupId>uk.gov.justice.framework-api</groupId>
+            <artifactId>framework-api-event-listener-interceptors</artifactId>
+            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
index eb0c95b6..25dcf7bb 100644
--- a/example-context/example-service/example-event/pom.xml
+++ b/example-context/example-service/example-event/pom.xml
@@ -152,9 +152,9 @@
                                 <version>${framework-generators.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>uk.gov.justice.event-store</groupId>
+                                <groupId>uk.gov.justice.services</groupId>
                                 <artifactId>event-subscription</artifactId>
-                                <version>${event-store.version}</version>
+                                <version>${framework.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
diff --git a/pom.xml b/pom.xml
index 0c9cc432..6d270251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,12 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
         <common-bom.version>1.29.0</common-bom.version>
-        <framework.version>5.3.0-M3</framework.version>
+        <framework.version>6.0.0-M1</framework.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <event-store.version>1.2.0-M3</event-store.version>
-        <framework-domain.version>1.1.2-M1</framework-domain.version>
-        <framework-generators.version>1.2.0-M2</framework-generators.version>
+        <event-store.version>2.0.0-M1</event-store.version>
+        <framework-generators.version>2.0.0-M1</framework-generators.version>
         <file.service.version>1.17.4</file.service.version>
-        <framework-api.version>3.4.0-M1</framework-api.version>
+        <framework-api.version>4.0.0-M1</framework-api.version>
         <generator-maven-plugin.version>2.6.2</generator-maven-plugin.version>
         <json-schema-catalog.version>1.5.0</json-schema-catalog.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>