diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 599bd63666..365d368197 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -21,7 +21,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: 14
+        java-version: 17
         check-latest: true
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -69,7 +69,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: 14
+        java-version: 17
         check-latest: true
     - name: Execute gradle dependencyCheckAnalyze task
       run: ./gradlew dependencyCheckAnalyze -x test
@@ -84,7 +84,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: 14
+        java-version: 17
         check-latest: true
     - name: Execute gradle test
       run: ./gradlew test -x dependencyCheckAnalyze -x :tests:acceptance-test:test -x javadoc --info
@@ -100,7 +100,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: 14
+        java-version: 17
         check-latest: true
     - name: Download tessera dist
       uses: actions/download-artifact@v2
@@ -159,7 +159,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 14
+          java-version: 17
           check-latest: true
       - name: Download tessera dist
         uses: actions/download-artifact@v2
@@ -218,7 +218,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 14
+          java-version: 17
           check-latest: true
       - name: Download tessera dist
         uses: actions/download-artifact@v2
@@ -276,7 +276,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 14
+          java-version: 17
           check-latest: true
       - name: Download tessera dist
         uses: actions/download-artifact@v2
@@ -345,7 +345,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 14
+          java-version: 17
           check-latest: true
       - name: Download tessera dist
         uses: actions/download-artifact@v2
diff --git a/README.md b/README.md
index 7f40aead99..bbc3969d00 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ The following artefacts can be [added to a distribution](#supplementing-the-dist
 
 ## Prerequisites
 - [Java](https://www.oracle.com/technetwork/java/javase/downloads/index.html)
-    - Java 11+ (tested up to Java 14), code source is Java 11.
+    - Java 17+
 
 - [Optional: Gradle](https://gradle.org/install/)<br/>
     - If you want to use a locally installed Gradle rather than the included wrapper. Note: wrapper currently uses Gradle 7.0.2.
diff --git a/argon2/src/main/java/com/quorum/tessera/argon2/Argon2Impl.java b/argon2/src/main/java/com/quorum/tessera/argon2/Argon2Impl.java
index 0d7c2cd0cb..e198672500 100644
--- a/argon2/src/main/java/com/quorum/tessera/argon2/Argon2Impl.java
+++ b/argon2/src/main/java/com/quorum/tessera/argon2/Argon2Impl.java
@@ -40,15 +40,11 @@ public ArgonResult hash(final char[] password, final byte[] salt) {
   private Argon2Advanced getArgon2Instance(final String algorithm) {
     LOGGER.debug("Searching for the Argon2 algorithm {}", algorithm);
 
-    switch (algorithm) {
-      case "d":
-        return Argon2Factory.createAdvanced(Argon2Factory.Argon2Types.ARGON2d);
-      case "id":
-        return Argon2Factory.createAdvanced(Argon2Factory.Argon2Types.ARGON2id);
-      case "i":
-        return Argon2Factory.createAdvanced(Argon2Factory.Argon2Types.ARGON2i);
-      default:
-        throw new IllegalArgumentException("Invalid Argon2 algorithm " + algorithm);
-    }
+    return switch (algorithm) {
+      case "d" -> Argon2Factory.createAdvanced(Argon2Factory.Argon2Types.ARGON2d);
+      case "id" -> Argon2Factory.createAdvanced(Argon2Factory.Argon2Types.ARGON2id);
+      case "i" -> Argon2Factory.createAdvanced(Argon2Factory.Argon2Types.ARGON2i);
+      default -> throw new IllegalArgumentException("Invalid Argon2 algorithm " + algorithm);
+    };
   }
 }
diff --git a/build.gradle b/build.gradle
index 6750a0efb0..b1ee2f1fc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ import java.time.Duration
 plugins {
   id "org.owasp.dependencycheck" version "7.1.0.1"
   id 'jacoco'
-  id 'com.diffplug.spotless' version '5.17.1'
+  id 'com.diffplug.spotless' version '6.11.0'
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
   id "org.javamodularity.moduleplugin" version "1.8.8"
   id 'org.ec4j.editorconfig' version '0.0.3'
@@ -57,7 +57,7 @@ allprojects {
         testImplementation "junit:junit:4.13"
 
         testImplementation "org.assertj:assertj-core:3.18.0"
-        testImplementation "org.mockito:mockito-inline:3.4.4"
+        testImplementation "org.mockito:mockito-inline:4.8.1"
 
         testImplementation "com.github.jknack:handlebars:4.2.0"
 
@@ -76,7 +76,7 @@ allprojects {
         implementation "org.apache.commons:commons-lang3:3.12.0"
 
         implementation "com.github.jnr:jnr-unixsocket:0.38.15"
-        implementation "com.github.jnr:jffi:1.3.8"
+        implementation "com.github.jnr:jffi:1.3.9"
 
         implementation "de.mkammerer:argon2-jvm:2.5"
 
@@ -256,7 +256,7 @@ subprojects {
   }
 
   jacoco {
-    toolVersion = "0.8.6"
+    toolVersion = "0.8.8"
   }
 
   spotless {
@@ -271,7 +271,7 @@ subprojects {
         include "**/src/test/java/**/*.java"
       }
       removeUnusedImports()
-      googleJavaFormat("1.7")
+      googleJavaFormat("1.15.0")
       trimTrailingWhitespace()
       endWithNewline()
     }
@@ -346,7 +346,7 @@ subprojects {
     }
   }
 
-  sourceCompatibility = "11"
+  sourceCompatibility = JavaVersion.VERSION_17
 
   java {
     withJavadocJar()
diff --git a/cli/cli-api/src/test/java/com/quorum/tessera/cli/keypassresolver/CliKeyPasswordResolverTest.java b/cli/cli-api/src/test/java/com/quorum/tessera/cli/keypassresolver/CliKeyPasswordResolverTest.java
index 669b44f5df..0847d58ecf 100644
--- a/cli/cli-api/src/test/java/com/quorum/tessera/cli/keypassresolver/CliKeyPasswordResolverTest.java
+++ b/cli/cli-api/src/test/java/com/quorum/tessera/cli/keypassresolver/CliKeyPasswordResolverTest.java
@@ -279,7 +279,7 @@ public void lockedKeyWithValidPasswordDoesNotRequestPassword() {
 
     this.cliKeyPasswordResolver.getSingleKeyPassword(0, keyPair, keyEncryptor);
 
-    verifyZeroInteractions(passwordReader);
+    verifyNoInteractions(passwordReader);
   }
 
   //    @Test
diff --git a/config/src/main/java/com/quorum/tessera/config/ServerConfig.java b/config/src/main/java/com/quorum/tessera/config/ServerConfig.java
index 3daa1208c7..db7caefff8 100644
--- a/config/src/main/java/com/quorum/tessera/config/ServerConfig.java
+++ b/config/src/main/java/com/quorum/tessera/config/ServerConfig.java
@@ -47,7 +47,9 @@ public class ServerConfig extends ConfigItem {
   @XmlElement
   private Map<String, String> properties = Collections.emptyMap();
 
-  /** @deprecated USe default constructor and setters */
+  /**
+   * @deprecated USe default constructor and setters
+   */
   @Deprecated
   public ServerConfig(
       final AppType app,
diff --git a/config/src/test/java/com/quorum/tessera/config/constraints/Base64ValidatorTest.java b/config/src/test/java/com/quorum/tessera/config/constraints/Base64ValidatorTest.java
index 6de14173e2..12ca63f45c 100644
--- a/config/src/test/java/com/quorum/tessera/config/constraints/Base64ValidatorTest.java
+++ b/config/src/test/java/com/quorum/tessera/config/constraints/Base64ValidatorTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import jakarta.validation.ConstraintValidatorContext;
 import java.util.Base64;
@@ -24,7 +24,7 @@ public void onSetup() {
 
   @After
   public void onTearDown() {
-    verifyZeroInteractions(constraintValidatorContext);
+    verifyNoMoreInteractions(constraintValidatorContext);
   }
 
   @Test
diff --git a/config/src/test/java/com/quorum/tessera/config/constraints/PathValidatorTest.java b/config/src/test/java/com/quorum/tessera/config/constraints/PathValidatorTest.java
index d45c8c1c0e..a8eb49ed4f 100644
--- a/config/src/test/java/com/quorum/tessera/config/constraints/PathValidatorTest.java
+++ b/config/src/test/java/com/quorum/tessera/config/constraints/PathValidatorTest.java
@@ -78,7 +78,7 @@ public void nullPathReturnsTrue() {
 
     assertThat(pathValidator.isValid(null, context)).isTrue();
 
-    verifyZeroInteractions(context);
+    verifyNoInteractions(context);
   }
 
   @Test
@@ -96,7 +96,7 @@ public void checkCanCreateFile() throws IOException {
 
     assertThat(pathValidator.isValid(path, context)).isTrue();
 
-    verifyZeroInteractions(context);
+    verifyNoInteractions(context);
   }
 
   @Test
diff --git a/config/src/test/java/com/quorum/tessera/config/keypairs/FilesystemKeyPairTest.java b/config/src/test/java/com/quorum/tessera/config/keypairs/FilesystemKeyPairTest.java
index ec8fadddd6..84033089b4 100644
--- a/config/src/test/java/com/quorum/tessera/config/keypairs/FilesystemKeyPairTest.java
+++ b/config/src/test/java/com/quorum/tessera/config/keypairs/FilesystemKeyPairTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import com.quorum.tessera.config.KeyDataConfig;
 import com.quorum.tessera.config.PrivateKeyData;
@@ -105,6 +105,6 @@ public void noDelegateInclinePair() {
     assertThat(filesystemKeyPair.getPrivateKeyPath()).isSameAs(privateKeyPath);
     assertThat(filesystemKeyPair.getPublicKeyPath()).isSameAs(publicKeyPath);
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 }
diff --git a/config/src/test/java/com/quorum/tessera/config/keypairs/InlineKeypairTest.java b/config/src/test/java/com/quorum/tessera/config/keypairs/InlineKeypairTest.java
index c6423ade8f..d0a2f6e66f 100644
--- a/config/src/test/java/com/quorum/tessera/config/keypairs/InlineKeypairTest.java
+++ b/config/src/test/java/com/quorum/tessera/config/keypairs/InlineKeypairTest.java
@@ -40,7 +40,7 @@ public void unlockedKeyGetsValue() {
 
     assertThat(result.getPrivateKey()).isEqualTo(value);
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -54,7 +54,7 @@ public void nullPasswordGivesNullKey() {
     result.withPassword(null);
 
     assertThat(result.getPrivateKey()).isNull();
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
diff --git a/config/src/test/java/com/quorum/tessera/config/util/KeyDataUtilTest.java b/config/src/test/java/com/quorum/tessera/config/util/KeyDataUtilTest.java
index 0b74796409..5b54c24d28 100644
--- a/config/src/test/java/com/quorum/tessera/config/util/KeyDataUtilTest.java
+++ b/config/src/test/java/com/quorum/tessera/config/util/KeyDataUtilTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import com.quorum.tessera.config.KeyData;
 import com.quorum.tessera.config.KeyDataConfig;
@@ -189,7 +189,7 @@ public void unmarshalDirectKeyPair() {
     assertThat(result.getPublicKey()).isEqualTo("PUBLICKEY");
     assertThat(result.getPrivateKey()).isEqualTo("PRIVATEKEY");
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -208,7 +208,7 @@ public void unmarshalInlineKeypair() {
     assertThat(result.getPublicKey()).isEqualTo("PUBLICKEY");
     assertThat(result.getPrivateKeyConfig()).isSameAs(config);
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -229,7 +229,7 @@ public void unmarshalAzureVaultKeyPair() {
     assertThat(result.getPrivateKeyId()).isEqualTo("AzureVaultPrivateKeyId");
     assertThat(result.getPublicKeyId()).isEqualTo("AzureVaultPublicKeyId");
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -254,7 +254,7 @@ public void unmarshalHashicorpVaultKeyPair() {
     assertThat(result.getSecretEngineName()).isEqualTo("HashicorpVaultSecretEngineName");
     assertThat(result.getSecretName()).isEqualTo("HashicorpSecretName");
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -278,7 +278,7 @@ public void unmarshalHashicorpVaultKeyPairNoSecretVersionDefined() {
     assertThat(result.getSecretEngineName()).isEqualTo("HashicorpVaultSecretEngineName");
     assertThat(result.getSecretName()).isEqualTo("HashicorpSecretName");
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -296,7 +296,7 @@ public void unmarshalAwsVaultKeyPair() {
     assertThat(result.getPrivateKeyId()).isEqualTo("AwsSecretsManagerPrivateKeyId");
     assertThat(result.getPublicKeyId()).isEqualTo("AwsSecretsManagerPublicKeyId");
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -317,7 +317,7 @@ public void unmarshalFilesystemKeyPair() {
     assertThat(result.getPrivateKeyPath()).isSameAs(privateKeyPath);
     assertThat(result.getPublicKeyPath()).isSameAs(publicKeyPath);
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
@@ -330,7 +330,7 @@ public void unmarshalUnknownKeyPair() {
 
     assertThat(result).isNotNull();
 
-    verifyZeroInteractions(keyEncryptor);
+    verifyNoInteractions(keyEncryptor);
   }
 
   @Test
diff --git a/cvss-suppressions.xml b/cvss-suppressions.xml
index d4a4113bd3..c7fb285c39 100644
--- a/cvss-suppressions.xml
+++ b/cvss-suppressions.xml
@@ -32,4 +32,12 @@
         <packageUrl regex="true">^pkg:maven/org.yaml/snakeyaml@1.33</packageUrl>
         <cve>CVE-2022-38752</cve>
     </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: hsqldb-2.5.1.jar
+   Until 2.7.1 is released
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.hsqldb/hsqldb@2.5.1</packageUrl>
+        <cve>CVE-2022-41853</cve>
+    </suppress>
 </suppressions>
diff --git a/docker/enclave.Dockerfile b/docker/enclave.Dockerfile
index bc97cc89b9..17f112ad7e 100644
--- a/docker/enclave.Dockerfile
+++ b/docker/enclave.Dockerfile
@@ -11,7 +11,7 @@ RUN mkdir /install
 RUN mkdir /install/enclave-jaxrs && tar xvf $(find . -name enclave-jaxrs-*.tar 2>/dev/null) -C /install/enclave-jaxrs --strip-components 1
 
 # Create executable image
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:17-jre-jammy
 
 RUN apt-get update && apt-get install -y \
   wget \
diff --git a/docker/tessera.Dockerfile b/docker/tessera.Dockerfile
index d45d45f5c1..2953d536b7 100644
--- a/docker/tessera.Dockerfile
+++ b/docker/tessera.Dockerfile
@@ -11,7 +11,7 @@ RUN mkdir /install
 RUN mkdir /install/tessera && tar xvf $(find . -name tessera-*.tar 2>/dev/null) -C /install/tessera --strip-components 1
 
 # Create executable image
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:17-jre-jammy
 
 RUN apt-get update && apt-get install -y \
   wget \
@@ -20,4 +20,4 @@ RUN apt-get update && apt-get install -y \
 
 COPY --from=extractor /install/tessera/ /tessera
 
-ENTRYPOINT ["/tessera/bin/tessera"]
\ No newline at end of file
+ENTRYPOINT ["/tessera/bin/tessera"]
diff --git a/docker/tessera.aws.Dockerfile b/docker/tessera.aws.Dockerfile
index 6aa6a5121b..76b61984c6 100644
--- a/docker/tessera.aws.Dockerfile
+++ b/docker/tessera.aws.Dockerfile
@@ -16,7 +16,7 @@ RUN mkdir /install/aws-key-vault && tar xvf $(find . -name aws-key-vault-*.tar 2
 RUN mkdir /install/tessera-plus-vault && cp -a /install/aws-key-vault/. /install/tessera-plus-vault/ && cp -a /install/tessera/. /install/tessera-plus-vault/
 
 # Create executable image
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:17-jre-jammy
 
 RUN apt-get update && apt-get install -y \
   wget \
diff --git a/docker/tessera.azure.Dockerfile b/docker/tessera.azure.Dockerfile
index 98ae5a50b0..43724fe677 100644
--- a/docker/tessera.azure.Dockerfile
+++ b/docker/tessera.azure.Dockerfile
@@ -16,7 +16,7 @@ RUN mkdir /install/azure-key-vault && tar xvf $(find . -name azure-key-vault-*.t
 RUN mkdir /install/tessera-plus-vault && cp -a /install/azure-key-vault/. /install/tessera-plus-vault/ && cp -a /install/tessera/. /install/tessera-plus-vault/
 
 # Create executable image
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:17-jre-jammy
 
 RUN apt-get update && apt-get install -y \
   wget \
diff --git a/docker/tessera.hashicorp.Dockerfile b/docker/tessera.hashicorp.Dockerfile
index a179ebbad7..44e3f0b144 100644
--- a/docker/tessera.hashicorp.Dockerfile
+++ b/docker/tessera.hashicorp.Dockerfile
@@ -16,7 +16,7 @@ RUN mkdir /install/hashicorp-key-vault && tar xvf $(find . -name hashicorp-key-v
 RUN mkdir /install/tessera-plus-vault && cp -a /install/hashicorp-key-vault/. /install/tessera-plus-vault/ && cp -a /install/tessera/. /install/tessera-plus-vault/
 
 # Create executable image
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:17-jre-jammy
 
 RUN apt-get update && apt-get install -y \
   wget \
diff --git a/enclave/enclave-jaxrs/build.gradle b/enclave/enclave-jaxrs/build.gradle
index 1fcf8552f7..507307ee82 100644
--- a/enclave/enclave-jaxrs/build.gradle
+++ b/enclave/enclave-jaxrs/build.gradle
@@ -13,7 +13,10 @@ application {
     "-Djakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory",
     "--add-opens=org.glassfish.json.jaxrs/org.glassfish.json.jaxrs=org.glassfish.hk2.utilities"
   ]
-  startScripts.enabled = true
+  startScripts {
+    def template = "${rootProject.projectDir}/gradle/unixStartScript.txt"
+    unixStartScriptGenerator.template = resources.text.fromFile(template)
+  }
 }
 
 configurations.all {
diff --git a/gradle/unixStartScript.txt b/gradle/unixStartScript.txt
new file mode 100644
index 0000000000..3c4783e506
--- /dev/null
+++ b/gradle/unixStartScript.txt
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  ${applicationName} start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: \$0 may be a link
+PRG="\$0"
+# Need this for relative symlinks.
+while [ -h "\$PRG" ] ; do
+    ls=`ls -ld "\$PRG"`
+    link=`expr "\$ls" : '.*-> \\(.*\\)\$'`
+    if expr "\$link" : '/.*' > /dev/null; then
+        PRG="\$link"
+    else
+        PRG=`dirname "\$PRG"`"/\$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"\$PRG\"`/${appHomeRelativePath}" >/dev/null
+APP_HOME="`pwd -P`"
+cd "\$SAVED" >/dev/null
+
+APP_NAME="${applicationName}"
+APP_BASE_NAME=`basename "\$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "\$*"
+}
+
+die () {
+    echo
+    echo "\$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$classpath
+<% if ( mainClassName.startsWith('--module ') ) { %>MODULE_PATH=$modulePath<% } %>
+
+# Determine the Java command to use to start the JVM.
+if [ -n "\$JAVA_HOME" ] ; then
+    if [ -x "\$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="\$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="\$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "\$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: \$JAVA_HOME
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "\$cygwin" = "false" -a "\$darwin" = "false" -a "\$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ \$? -eq 0 ] ; then
+        if [ "\$MAX_FD" = "maximum" -o "\$MAX_FD" = "max" ] ; then
+            MAX_FD="\$MAX_FD_LIMIT"
+        fi
+        ulimit -n \$MAX_FD
+        if [ \$? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: \$MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: \$MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if \$darwin; then
+    GRADLE_OPTS="\$GRADLE_OPTS \\"-Xdock:name=\$APP_NAME\\" \\"-Xdock:icon=\$APP_HOME/media/gradle.icns\\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "\$cygwin" = "true" -o "\$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "\$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "\$CLASSPATH"`
+<% if ( mainClassName.startsWith('--module ') ) { %>    MODULE_PATH=`cygpath --path --mixed "\$MODULE_PATH"`<% } %>
+    JAVACMD=`cygpath --unix "\$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in \$ROOTDIRSRAW ; do
+        ROOTDIRS="\$ROOTDIRS\$SEP\$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^(\$ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "\$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="\$OURCYGPATTERN|(\$GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "\$@" ; do
+        CHECK=`echo "\$arg"|egrep -c "\$OURCYGPATTERN" -`
+        CHECK2=`echo "\$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ \$CHECK -ne 0 ] && [ \$CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args\$i`=`cygpath --path --ignore --mixed "\$arg"`
+        else
+            eval `echo args\$i`="\"\$arg\""
+        fi
+        i=`expr \$i + 1`
+    done
+    case \$i in
+        0) set -- ;;
+        1) set -- "\$args0" ;;
+        2) set -- "\$args0" "\$args1" ;;
+        3) set -- "\$args0" "\$args1" "\$args2" ;;
+        4) set -- "\$args0" "\$args1" "\$args2" "\$args3" ;;
+        5) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" ;;
+        6) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" ;;
+        7) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" ;;
+        8) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" ;;
+        9) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" "\$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\\\n "\$i" | sed "s/'/'\\\\\\\\''/g;1s/^/'/;\\\$s/\\\$/' \\\\\\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "\$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- \$DEFAULT_JVM_OPTS \$JAVA_OPTS \$${optsEnvironmentVar} <% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <% } %>-classpath "\"\$CLASSPATH\"" <% if ( mainClassName.startsWith('--module ') ) { %>--module-path "\"\$MODULE_PATH\"" <% } %>${mainClassName} "\$APP_ARGS"
+
+exec "\$JAVACMD" "\$@"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..249e5832f0 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf516..ae04661ee7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c81..a69d9cb6c2 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f938..53a6b238d4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/migration/multitenancy/build.gradle b/migration/multitenancy/build.gradle
index 462a7198da..4e9c48c963 100644
--- a/migration/multitenancy/build.gradle
+++ b/migration/multitenancy/build.gradle
@@ -32,7 +32,10 @@ application {
     "-Djakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory",
     "-Dtessera.cli.type=MULTITENANCY_MIGRATION"
   ]
-  startScripts.enabled = true
+  startScripts {
+    def template = "${rootProject.projectDir}/gradle/unixStartScript.txt"
+    unixStartScriptGenerator.template = resources.text.fromFile(template)
+  }
 }
 
 modularity.disableEffectiveArgumentsAdjustment()
diff --git a/server/jersey-server/src/main/java/com/quorum/tessera/server/monitoring/MetricsEnquirer.java b/server/jersey-server/src/main/java/com/quorum/tessera/server/monitoring/MetricsEnquirer.java
index 72dd66a12f..d90f9c11da 100644
--- a/server/jersey-server/src/main/java/com/quorum/tessera/server/monitoring/MetricsEnquirer.java
+++ b/server/jersey-server/src/main/java/com/quorum/tessera/server/monitoring/MetricsEnquirer.java
@@ -1,10 +1,7 @@
 package com.quorum.tessera.server.monitoring;
 
 import com.quorum.tessera.config.AppType;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import javax.management.*;
 
 public class MetricsEnquirer {
@@ -45,31 +42,25 @@ public List<MBeanMetric> getMBeanMetrics(AppType appType) {
 
   private Set<ObjectName> getTesseraResourceMBeanNames(AppType appType)
       throws MalformedObjectNameException {
-    final String type;
-    switch (appType) {
-      case P2P:
-        type = "P2PRestApp";
-        break;
-      case Q2T:
-        type = "Q2TRestApp";
-        break;
-      case ADMIN:
-        type = "AdminRestApp";
-        break;
-      case THIRD_PARTY:
-        type = "ThirdPartyRestApp";
-        break;
-      case ENCLAVE:
-        type = "EnclaveApplication";
-        break;
-      default:
-        throw new MonitoringNotSupportedException(appType);
-    }
 
-    String pattern =
-        String.format(
-            "org.glassfish.jersey:type=%s,subType=Resources,resource=com.quorum.tessera.*,executionTimes=RequestTimes,detail=methods,method=*",
-            type);
+    final String pattern =
+        Optional.ofNullable(appType)
+            .map(
+                at ->
+                    switch (at) {
+                      case P2P -> "P2PRestApp";
+                      case Q2T -> "Q2TRestApp";
+                      case ADMIN -> "AdminRestApp";
+                      case THIRD_PARTY -> "ThirdPartyRestApp";
+                      case ENCLAVE -> "EnclaveApplication";
+                    })
+            .map(
+                t ->
+                    String.format(
+                        "org.glassfish.jersey:type=%s,subType=Resources,resource=com.quorum.tessera.*,executionTimes=RequestTimes,detail=methods,method=*",
+                        t))
+            .orElseThrow(() -> new MonitoringNotSupportedException(appType));
+
     return Collections.unmodifiableSet(this.mBeanServer.queryNames(new ObjectName(pattern), null));
   }
 
diff --git a/tessera-dist/build.gradle b/tessera-dist/build.gradle
index 4e632c4338..a2be4e93ea 100644
--- a/tessera-dist/build.gradle
+++ b/tessera-dist/build.gradle
@@ -15,7 +15,10 @@ application {
     "-Djakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory",
     "--add-opens=org.glassfish.json.jaxrs/org.glassfish.json.jaxrs=org.glassfish.hk2.utilities",
   ]
-  startScripts.enabled = true
+  startScripts {
+    def template = "${rootProject.projectDir}/gradle/unixStartScript.txt"
+    unixStartScriptGenerator.template = resources.text.fromFile(template)
+  }
 }
 
 configurations.all {
diff --git a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/resend/ResendResponse.java b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/resend/ResendResponse.java
index a8375a3d5e..dfb45eee40 100644
--- a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/resend/ResendResponse.java
+++ b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/resend/ResendResponse.java
@@ -12,7 +12,9 @@ public ResendResponse(byte[] payload) {
     this.payload = payload;
   }
 
-  /** @return Optional encoded payload */
+  /**
+   * @return Optional encoded payload
+   */
   public Optional<byte[]> getPayload() {
     return Optional.ofNullable(payload);
   }
diff --git a/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource3.java b/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource3.java
index 6a067164c3..a25661bb78 100644
--- a/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource3.java
+++ b/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource3.java
@@ -163,8 +163,10 @@ public Response send(@NotNull @Valid @PrivacyValid final SendRequest sendRequest
             .get();
 
     final String[] managedParties =
-        Optional.of(response).map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
-            .orElse(Collections.emptySet()).stream()
+        Optional.of(response)
+            .map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
+            .orElse(Collections.emptySet())
+            .stream()
             .map(PublicKey::encodeToBase64)
             .toArray(String[]::new);
 
@@ -305,8 +307,10 @@ public Response sendSignedTransaction(
             .build();
 
     final String[] managedParties =
-        Optional.of(response).map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
-            .orElse(Collections.emptySet()).stream()
+        Optional.of(response)
+            .map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
+            .orElse(Collections.emptySet())
+            .stream()
             .map(PublicKey::encodeToBase64)
             .toArray(String[]::new);
 
diff --git a/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource4.java b/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource4.java
index 5285ff4824..4130b4edef 100644
--- a/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource4.java
+++ b/tessera-jaxrs/transaction-jaxrs/src/main/java/com/quorum/tessera/q2t/TransactionResource4.java
@@ -131,8 +131,10 @@ public Response send(@NotNull @Valid @PrivacyValid final SendRequest sendRequest
             .get();
 
     final String[] managedParties =
-        Optional.of(response).map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
-            .orElse(Collections.emptySet()).stream()
+        Optional.of(response)
+            .map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
+            .orElse(Collections.emptySet())
+            .stream()
             .map(PublicKey::encodeToBase64)
             .toArray(String[]::new);
 
@@ -225,8 +227,10 @@ public Response sendSignedTransaction(
             .build();
 
     final String[] managedParties =
-        Optional.of(response).map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
-            .orElse(Collections.emptySet()).stream()
+        Optional.of(response)
+            .map(com.quorum.tessera.transaction.SendResponse::getManagedParties)
+            .orElse(Collections.emptySet())
+            .stream()
             .map(PublicKey::encodeToBase64)
             .toArray(String[]::new);
 
diff --git a/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/internal/RestPayloadPublisherTest.java b/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/internal/RestPayloadPublisherTest.java
index b5e14ba638..d2e9c9da2a 100644
--- a/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/internal/RestPayloadPublisherTest.java
+++ b/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/internal/RestPayloadPublisherTest.java
@@ -120,7 +120,7 @@ public void publish() {
     verify(discovery, times(iterations)).getRemoteNodeInfo(publicKey);
     verify(payloadEncoder, times(iterations)).encode(encodedPayload);
     payloadEncoderFactoryFunction.verify(
-        times(iterations), () -> PayloadEncoder.create(any(EncodedPayloadCodec.class)));
+        () -> PayloadEncoder.create(any(EncodedPayloadCodec.class)), times(iterations));
   }
 
   @Test
@@ -158,7 +158,7 @@ public void publishEnhancedTransactionsToNodesThatDoNotSupport() {
     }
 
     payloadEncoderFactoryFunction.verify(
-        times(2), () -> PayloadEncoder.create(any(EncodedPayloadCodec.class)));
+        () -> PayloadEncoder.create(any(EncodedPayloadCodec.class)), times(2));
   }
 
   @Test
diff --git a/tessera-partyinfo/src/main/java/com/quorum/tessera/discovery/internal/DiscoveryProvider.java b/tessera-partyinfo/src/main/java/com/quorum/tessera/discovery/internal/DiscoveryProvider.java
index 8f3d4eeb68..0e0c9c3228 100644
--- a/tessera-partyinfo/src/main/java/com/quorum/tessera/discovery/internal/DiscoveryProvider.java
+++ b/tessera-partyinfo/src/main/java/com/quorum/tessera/discovery/internal/DiscoveryProvider.java
@@ -13,7 +13,9 @@ public class DiscoveryProvider {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(DiscoveryProvider.class);
 
-  /** @see java.util.ServiceLoader.Provider */
+  /**
+   * @see java.util.ServiceLoader.Provider
+   */
   public static Discovery provider() {
     final DiscoveryHolder discoveryHolder = DiscoveryHolder.create();
     if (discoveryHolder.get().isPresent()) {