diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml
index 98487ab8..fc369c29 100644
--- a/example-context/example-service/pom.xml
+++ b/example-context/example-service/pom.xml
@@ -118,9 +118,9 @@
                 </plugin>
 
                 <plugin>
-                    <artifactId>generator-plugin</artifactId>
-                    <groupId>uk.gov.justice.maven.generator</groupId>
-                    <version>${generator-maven-plugin.version}</version>
+                    <groupId>uk.gov.justice.schema</groupId>
+                    <artifactId>catalog-generation-plugin</artifactId>
+                    <version>${json-schema-catalog.version}</version>
                     <executions>
                         <execution>
                             <id>schema-catalog-generation</id>
@@ -140,7 +140,7 @@
                                 </generatorProperties>
                             </configuration>
                             <goals>
-                                <goal>generate</goal>
+                                <goal>generate-schema-catalog</goal>
                             </goals>
                             <phase>generate-sources</phase>
                         </execution>
@@ -160,7 +160,7 @@
                                 </generatorProperties>
                             </configuration>
                             <goals>
-                                <goal>generate</goal>
+                                <goal>generate-schema-catalog</goal>
                             </goals>
                             <phase>generate-sources</phase>
                         </execution>
@@ -336,9 +336,9 @@
             <build>
                 <plugins>
                     <plugin>
-                        <artifactId>generator-plugin</artifactId>
-                        <groupId>uk.gov.justice.maven.generator</groupId>
-                        <version>${generator-maven-plugin.version}</version>
+                        <groupId>uk.gov.justice.schema</groupId>
+                        <artifactId>catalog-generation-plugin</artifactId>
+                        <version>${json-schema-catalog.version}</version>
                         <configuration>
                             <parserName>uk.gov.justice.maven.generator.io.files.parser.RamlFileParser
                             </parserName>
@@ -347,14 +347,14 @@
                             <execution>
                                 <id>schema-catalog-generation</id>
                                 <goals>
-                                    <goal>generate</goal>
+                                    <goal>generate-schema-catalog</goal>
                                 </goals>
                                 <phase>generate-sources</phase>
                             </execution>
                             <execution>
                                 <id>raml-schema-catalog-generation</id>
                                 <goals>
-                                    <goal>generate</goal>
+                                    <goal>generate-schema-catalog</goal>
                                 </goals>
                                 <phase>generate-sources</phase>
                             </execution>
diff --git a/pom.xml b/pom.xml
index cc99905b..c8208e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,14 +31,14 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
         <common-bom.version>1.29.0</common-bom.version>
-        <framework.version>6.0.0-M1</framework.version>
+        <framework.version>6.0.0-M2</framework.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <event-store.version>2.0.0-M1</event-store.version>
-        <framework-generators.version>2.0.0-M2</framework-generators.version>
+        <event-store.version>2.0.0-M2</event-store.version>
+        <framework-generators.version>2.0.0-M3</framework-generators.version>
         <file.service.version>1.17.4</file.service.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>
+        <json-schema-catalog.version>1.6.0</json-schema-catalog.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
         <jboss-vfs.version>3.2.12.Final</jboss-vfs.version>
         <raml-maven-plugin.version>1.6.5</raml-maven-plugin.version>