diff --git a/README.md b/README.md
index 01295c5..9d1c9b2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Alfresco Process Services SDK Project 2.2.0
+# Alfresco Process Services SDK Project 2.2.1
 
 The project consists of the following Maven submodules:
 
@@ -13,7 +13,7 @@ The project consists of the following Maven submodules:
 
 # Prerequisites
  * OpenJDK 11
- * Apache Maven 3.9.0
+ * Apache Maven 3.9.1
  * Docker (optional)
  * Put valid  _activiti.lic_  and  _transform.lic_  (or  _Aspose.Total.Java.lic_  )  in the `/license` folder for running unit / integration tests and for building containers 
  * Access to the Alfresco Nexus Repositories (credentials provided by Alfresco)
@@ -165,7 +165,8 @@ Put your Java test classes in the following package:
 # Supported Maven Profiles for dependencies management and packaging (JAR, WAR and Docker containers)
 
 In order to build the project, you can declare a Maven profile related to a specific APS version:
- * `aps2.3.6` (APS 2.3.6 - default)
+ * `aps2.3.7` (APS 2.3.7 - default)
+ * `aps2.3.6` (APS 2.3.6)
  * `aps2.3.5` (APS 2.3.5)
  * `aps2.3.4` (APS 2.3.4)
  * `aps2.3.3` (APS 2.3.3)
@@ -178,7 +179,7 @@ In order to build the project, you can declare a Maven profile related to a spec
  * `aps2.0.1` (APS 2.0.1)
  * `aps2.0.0` (APS 2.0.0) 
 
-Build and test with unit tests execution for APS 2.3.6 with:
+Build and test with unit tests execution for APS 2.3.7 with:
 `mvn clean test`
 
 Build and test with unit tests execution for APS 2.3.1 with:
@@ -218,7 +219,10 @@ Skip the build of the Activiti Admin container with:
  * Test your extensions with a consistent APS architecture running with Docker volumes
 
 # Contributors
-Thanks to Luca Stancapiano for testing and contributing on recent improvements. 
+ * Jeff Potts: updated the documentation
+ * Luca Stancapiano: testing and suggested new features
+ * Bindu Wavell: testing and created tools for introducing new capabilities
+ * Stanley Arnold: Fixed the Maven configuration
 
 # Enterprise support
 Official maintenance and support of this project is delivered by Zia Consulting
diff --git a/activiti-app-integration-tests/pom.xml b/activiti-app-integration-tests/pom.xml
index b27143c..2a338f0 100644
--- a/activiti-app-integration-tests/pom.xml
+++ b/activiti-app-integration-tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<properties>
diff --git a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
index d2ffc89..6389002 100644
--- a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
+++ b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
@@ -55,7 +55,7 @@ public class FourEyesAppIT {
 	protected static final String BASE_PATH_HOSTNAME = "localhost";
 	protected static final int BASE_PATH_PORT = 8080;
 
-	protected static final String appZipFile = "aps-extensions-jar-2.2.0-App.zip";
+	protected static final String appZipFile = "aps-extensions-jar-2.2.1-App.zip";
 
 	protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":"
 			+ BASE_PATH_PORT;
diff --git a/activiti-app-overlay-docker/pom.xml b/activiti-app-overlay-docker/pom.xml
index fcfd5b0..4967f36 100644
--- a/activiti-app-overlay-docker/pom.xml
+++ b/activiti-app-overlay-docker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<properties>
@@ -634,7 +634,7 @@
 												<status>200</status>
 												<method>GET</method>
 											</http>
-											<time>60000</time>
+											<time>120000</time>
 										</wait>
 										<volumes>
 											<bind>aps-es-volume:/usr/share/elasticsearch/data</bind>
diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7
new file mode 100644
index 0000000..d516726
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7
@@ -0,0 +1,37 @@
+FROM alfresco/process-services:${aps.docker.version}
+
+ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
+ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
+ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
+ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
+ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
+ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
+ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
+ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
+ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
+ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG CONTENT_STORAGE_DIR=/act_data
+
+USER root
+
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
+
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+RUN mkdir -p ${CONTENT_STORAGE_DIR}
+RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
+
+USER ${USERNAME}
\ No newline at end of file
diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7-arm64
new file mode 100644
index 0000000..0874dac
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7-arm64
@@ -0,0 +1,40 @@
+FROM tomcat:9-jdk11-openjdk
+
+ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
+ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
+ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
+ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
+ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
+ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
+ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
+ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
+ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
+ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
+ARG CONTENT_STORAGE_DIR=/act_data
+
+USER root
+
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
+
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+
+COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+RUN mkdir -p ${CONTENT_STORAGE_DIR}
+RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
+
+USER ${USERNAME}
\ No newline at end of file
diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7
new file mode 100644
index 0000000..5cc9cde
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7
@@ -0,0 +1,14 @@
+FROM alfresco/process-services-admin:${aps.docker.version}
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+
+USER root
+
+ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+USER ${USERNAME}
diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7-arm64 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7-arm64
new file mode 100644
index 0000000..4e7ed65
--- /dev/null
+++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7-arm64
@@ -0,0 +1,18 @@
+FROM tomcat:9-jdk11-openjdk-slim
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
+
+USER root
+
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} extensions/activiti-admin.war $TOMCAT_DIR/webapps
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
+
+USER ${USERNAME}
\ No newline at end of file
diff --git a/activiti-app-overlay-war/pom.xml b/activiti-app-overlay-war/pom.xml
index 3a9494e..ea16f31 100644
--- a/activiti-app-overlay-war/pom.xml
+++ b/activiti-app-overlay-war/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<dependencies>
diff --git a/aps-extensions-jar/pom.xml b/aps-extensions-jar/pom.xml
index 08c1c5d..bbefcee 100644
--- a/aps-extensions-jar/pom.xml
+++ b/aps-extensions-jar/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.alfresco.activiti</groupId>
 		<artifactId>aps-project</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<dependencyManagement>
diff --git a/aps-extensions-jar/src/test/resources/activiti/2.3.7/version.properties b/aps-extensions-jar/src/test/resources/activiti/2.3.7/version.properties
new file mode 100644
index 0000000..a70592a
--- /dev/null
+++ b/aps-extensions-jar/src/test/resources/activiti/2.3.7/version.properties
@@ -0,0 +1,5 @@
+type=bpmSuite
+version.major=2
+version.minor=3
+version.revision=7
+version.edition=Alfresco Process Services (powered by Activiti)
diff --git a/aps-extensions-jar/src/test/resources/activiti/version.properties b/aps-extensions-jar/src/test/resources/activiti/version.properties
index eb9cd7e..a70592a 100644
--- a/aps-extensions-jar/src/test/resources/activiti/version.properties
+++ b/aps-extensions-jar/src/test/resources/activiti/version.properties
@@ -1,5 +1,5 @@
 type=bpmSuite
 version.major=2
 version.minor=3
-version.revision=6
+version.revision=7
 version.edition=Alfresco Process Services (powered by Activiti)
diff --git a/pom.xml b/pom.xml
index 0bb9064..2ba8d29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.alfresco.activiti</groupId>
 	<artifactId>aps-project</artifactId>
-	<version>2.2.0</version>
+	<version>2.2.1</version>
 	<packaging>pom</packaging>
 	<name>APS - SDK Project</name>
 
@@ -28,7 +28,7 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
 		<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-		<docker-maven-plugin.version>0.41.0</docker-maven-plugin.version>
+		<docker-maven-plugin.version>0.42.0</docker-maven-plugin.version>
 		<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
 		<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
 		<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
@@ -423,7 +423,7 @@
 		<profile>
 			<id>aps2.3.6</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<activeByDefault>false</activeByDefault>
 			</activation>
 
 			<properties>
@@ -453,6 +453,40 @@
 				<docker-maven-plugin.build.save>false</docker-maven-plugin.build.save>
 			</properties>
 		</profile>
+		
+		<profile>
+			<id>aps2.3.7</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+
+			<properties>
+				<!-- APS 2.3.7 -->
+				<aps.version>2.3.7</aps.version>
+				<aps.docker.version>2.3.7</aps.docker.version>
+				<aps.version.major>2</aps.version.major>
+				<aps.version.minor>3</aps.version.minor>
+				<aps.version.revision>7</aps.version.revision>
+				<aps.2x.client.version>v2.3.7</aps.2x.client.version>
+				<opencsv.version>5.7.1</opencsv.version>
+				<jackson.version>2.14.1</jackson.version>
+				<bcprov.version>1.70</bcprov.version>
+				<activiti.version>7.9.0</activiti.version>
+				<spring.version>5.3.25.RELEASE</spring.version>
+				<spring-boot.version>2.5.12</spring-boot.version>
+				<spring-security.version>5.7.5</spring-security.version>
+				<elasticsearch.version>7.17.6</elasticsearch.version>
+				<elasticsearch-rest-client.version>7.17.6</elasticsearch-rest-client.version>
+				<hibernate.version>5.4.32.Final</hibernate.version>
+				<h2.version>2.1.214</h2.version>
+				<postgresql.version>13.1</postgresql.version>
+				<skipITs>false</skipITs>
+				<skip.integration.test>false</skip.integration.test>
+				<skip.swagger.client.generation>false</skip.swagger.client.generation>
+				<docker-maven-plugin.skip.save>false</docker-maven-plugin.skip.save>
+				<docker-maven-plugin.build.save>false</docker-maven-plugin.build.save>
+			</properties>
+		</profile>
 	</profiles>
 
 	<build>