diff --git a/pom.xml b/pom.xml
index f122c49..3966921 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,8 @@
 
 		<!-- If you want to build for your specific version, point to your own 
 			installation -->
-		<aps.baseUrl>https://activiti.alfresco.com</aps.baseUrl>
+		<aps.baseUrl>http://localhost:8080</aps.baseUrl>
+		<aps.app.tag>aps1</aps.app.tag>
 
 		<junit.version>5.7.2</junit.version>
 		<spring.version>5.2.14.RELEASE</spring.version>
@@ -86,6 +87,12 @@
 	
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<classifier>${aps.app.tag}</classifier>
+				</configuration>
+			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M5</version>
@@ -134,6 +141,7 @@
 			<id>raml-codegen</id>
 			<properties>
 				<aps.ramlUrl>${aps.baseUrl}/activiti-app/raml/activiti.raml</aps.ramlUrl>
+				<basePackage>com.inteligr8.alfresco.activiti</basePackage>
 			</properties>
 			<build>
 				<plugins>
@@ -143,31 +151,13 @@
 						<configuration>
 							<filesets>
 								<fileset>
-									<directory>src/main/java</directory>
+									<directory>src/gen/java</directory>
 									<includes>
-										<include>com/inteligr8/alfresco/activiti/raml/**/*</include>
+										<include>**/*</include>
 									</includes>
 								</fileset>
 							</filesets>
 						</configuration>
-						<executions>
-							<execution>
-								<id>delete-extras</id>
-								<phase>process-sources</phase>
-								<goals><goal>clean</goal></goals>
-								<configuration>
-									<excludeDefaultDirectories>true</excludeDefaultDirectories>
-									<filesets>
-										<fileset>
-											<directory>${project.build.directory}/ramlgen/java</directory>
-											<includes>
-												<include>com/inteligr8/alfresco/activiti/raml/**/*__*.java</include>
-									</includes>
-								</fileset>
-							</filesets>
-						</configuration>
-							</execution>
-						</executions>
 					</plugin>
 					<plugin>
 						<groupId>com.googlecode.maven-download-plugin</groupId>
@@ -247,22 +237,23 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.mule.raml.codegen</groupId>
-						<artifactId>raml-client-generator-maven-plugin</artifactId>
-						<version>0.11</version>
+						<groupId>org.raml.jaxrs</groupId>
+						<artifactId>raml-to-jaxrs-maven-plugin</artifactId>
+						<version>3.0.7</version>
 						<executions>
 							<execution>
-								<id>raml-aps-codegen</id>
+								<id>raml-codegen</id>
 								<phase>generate-sources</phase>
 								<goals>
-									<goal>generate-client</goal>
+									<goal>generate</goal>
 								</goals>
 								<configuration>
-									<basePackage>com.inteligr8.alfresco.activiti.raml</basePackage>
+									<resourcePackage>${basePackage}.resource</resourcePackage>
+									<modelPackage>${basePackage}.model</modelPackage>
+									<supportPackage>${basePackage}.support</supportPackage>
+									<generateTypesWith>jackson</generateTypesWith>
 									<ramlFile>${project.build.directory}/regexed/activiti.raml</ramlFile>
-									<includeAdditionalProperties>false</includeAdditionalProperties>
-									<outputDir>${project.build.directory}/ramlgen/java</outputDir>
-									<outputVersion>v2</outputVersion>
+									<outputDirectory>${basedir}/src/gen/java</outputDirectory>
 								</configuration>
 							</execution>
 						</executions>