diff --git a/README.md b/README.md
index 095da815..272161b8 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,14 @@ To customise the namespaces and create an application for your company please vi
 
 1. Clone one of the Java projects to your local machine from one of the following repos:
    ---
-    1. Simple web API: [stacks-java repository](https://github.com/amido/stacks-java)
-    2. Web API with CQRS: [stacks-java-cqrs repository](https://github.com/amido/stacks-java-cqrs)
-    3. Web API with CQRS and events: [stacks-java-cqrs-events repository](https://github.com/amido/stacks-java-cqrs-events)
+    1. Simple web API: [stacks-java repository](https://github.com/Ensono/stacks-java)
+    2. Web API with CQRS: [stacks-java-cqrs repository](https://github.com/Ensono/stacks-java-cqrs)
+    3. Web API with CQRS and events: [stacks-java-cqrs-events repository](https://github.com/Ensono/stacks-java-cqrs-events)
 
 2. Build and run the application
    ---
 
-   Note that at a minimum [Java 11](https://adoptopenjdk.net/) should be installed.
+   Note that at a minimum [Java 17](https://adoptopenjdk.net/) should be installed.
 
    Move to the `<PROJECT-NAME>/java` folder, then
 
diff --git a/build/jenkins/azure/jenkins-pipelines-javaspring-k8s.Jenkinsfile b/build/jenkins/azure/jenkins-pipelines-javaspring-k8s.Jenkinsfile
index 01d53b4f..ae302632 100644
--- a/build/jenkins/azure/jenkins-pipelines-javaspring-k8s.Jenkinsfile
+++ b/build/jenkins/azure/jenkins-pipelines-javaspring-k8s.Jenkinsfile
@@ -117,7 +117,7 @@ pipeline {
               // e.g.:
               // args '-v /var/run/docker.sock:/var/run/docker.sock -u 1000:999'
               // Please check with your admin on any required steps you need to take to ensure a SUDOers access inside the containers
-              image "azul/zulu-openjdk-debian:11"
+              image "azul/zulu-openjdk-debian:17"
             }
           }
 
@@ -215,7 +215,7 @@ pipeline {
               agent {
                 docker {
                   // add additional args if you need to here
-                  image "azul/zulu-openjdk-debian:11"
+                  image "azul/zulu-openjdk-debian:17"
                 }
               }
 
@@ -364,7 +364,7 @@ pipeline {
               agent {
                 docker {
                   // add additional args if you need to here
-                  image "azul/zulu-openjdk-debian:11"
+                  image "azul/zulu-openjdk-debian:17"
                 }
               }
 
@@ -866,7 +866,7 @@ pipeline {
         stage("PostDeployDev") {
           agent {
             docker {
-              image "azul/zulu-openjdk-debian:11"
+              image "azul/zulu-openjdk-debian:17"
             }
           }
 
diff --git a/java/pom.xml b/java/pom.xml
index 52387219..1f1cc575 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -36,6 +36,7 @@
     <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
     <spring.cloud.dependencies.version>2022.0.4</spring.cloud.dependencies.version>
     <pact.version>3.5.24</pact.version>
+    <spring.data.commons>3.3.1</spring.data.commons>
 
     <!-- Set 'pact.broker.url' and 'pact.broker.token' -->
     <pact.broker.url/>
@@ -237,6 +238,11 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+      <dependency>
+          <groupId>org.springframework.data</groupId>
+          <artifactId>spring-data-commons</artifactId>
+          <version>${spring.data.commons}</version>
+      </dependency>
 
   </dependencies>
 
diff --git a/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java b/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java
index b2ebf04c..2eb59f3b 100644
--- a/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java
+++ b/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java
@@ -16,7 +16,7 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 /** ApplicationConfig - Configuration class for Auth0 application security. */
-@Configuration("MySecurityConfig")
+@Configuration("mySecurityConfig")
 @EnableWebSecurity
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class ApplicationConfig {
diff --git a/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java b/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java
index c5128029..774ff4b1 100644
--- a/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java
+++ b/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java
@@ -38,7 +38,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
    * @param http
    * @throws Exception
    */
-  @Bean(name = "test_SecurityFilterChain")
+  @Bean(name = "testSecurityFilterChain")
   public SecurityFilterChain configure(HttpSecurity http) throws Exception {
     http.authorizeHttpRequests(auth -> auth.requestMatchers("**/*").anonymous())
         .httpBasic(withDefaults());
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java b/java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java
index 2f0ee358..2f3245b6 100644
--- a/java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java
@@ -21,8 +21,8 @@
     scheme = "bearer")
 public class OpenApiConfiguration {
 
-  private static final String PROJECT_URL = "https://github.com/amido/stacks-java";
-  private static final String STACKS_EMAIL = "stacks@amido.com";
+  private static final String PROJECT_URL = "https://github.com/Ensono/stacks-java";
+  private static final String STACKS_EMAIL = "stacks@ensono.com";
   private static final String SPRING_DOC = "http://springdoc.org";
 
   /** OAS/Swagger Configuration. */
@@ -38,7 +38,7 @@ public OpenAPI customOpenApi() {
                 .title("Menu API")
                 .version("1.0")
                 .description("APIs used to interact and manage menus for a restaurant")
-                .contact(new Contact().name("Amido").url(PROJECT_URL).email(STACKS_EMAIL))
+                .contact(new Contact().name("Ensono").url(PROJECT_URL).email(STACKS_EMAIL))
                 .license(new License().name("Apache 2.0").url(SPRING_DOC)));
   }
 
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java b/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java
index 168dd223..85572ef0 100644
--- a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java
@@ -1,18 +1,19 @@
 package com.amido.stacks.workloads.menu.domain;
 
-import jakarta.persistence.Id;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.data.annotation.Id;
 
 @Data
 @AllArgsConstructor
 @Builder
 public class Menu {
 
-  @Id private String id;
+  @Id
+  private String id;
 
   private String restaurantId;
 
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java b/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java
index ce3a8eed..dfc1be8c 100644
--- a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java
+++ b/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java
@@ -63,7 +63,7 @@ public SearchMenuResult search(
     return new SearchMenuResult(
         pageSize,
         pageNumber,
-        menuList.stream().map(searchMenuResultItemMapper::toDto).collect(Collectors.toList()));
+        menuList.stream().map(searchMenuResultItemMapper::toDto).toList());
   }
 
   public MenuDTO get(UUID id, String correlationId) {
diff --git a/java/src/main/resources/application-azure.yml b/java/src/main/resources/application-azure.yml
index 89231add..b40c9518 100644
--- a/java/src/main/resources/application-azure.yml
+++ b/java/src/main/resources/application-azure.yml
@@ -4,7 +4,7 @@ azure:
     enabled: true
   keyvault:
     enabled: false
-    uri: https://amido.stacks-tmp.vault.azure.net/
+    uri: https://ensono.stacks-tmp.vault.azure.net/
     client-id: xxxxxx
     client-key: xxxxxx
     tenant-id: xxxxxx
diff --git a/java/src/main/resources/auth.properties b/java/src/main/resources/auth.properties
index 9f57a6c7..74bfe6a3 100644
--- a/java/src/main/resources/auth.properties
+++ b/java/src/main/resources/auth.properties
@@ -1,12 +1,12 @@
 #The issuer of the JWT Token. Typically, this is your Auth0 domain with an https://
-auth.issuer=https://amidostacks.eu.auth0.com/
+auth.issuer=https://ensonostacks.eu.auth0.com/
 
 #The unique identifier for your API
-auth.apiAudience=https://amidostacks.eu.auth0.com/api/v2/
+auth.apiAudience=https://ensonostacks.eu.auth0.com/api/v2/
 
 #Config switch to enable (true) or disable(false) Auth0.Provide either true or false to enable or disable
 auth.isEnabled=false
 
-auth.resource.url=https://amidostacks.eu.auth0.com/oauth/tokenLocal
+auth.resource.url=https://ensonostacks.eu.auth0.com/oauth/tokenLocal
 
-auth.token.url=/v1/tokenLocal
\ No newline at end of file
+auth.token.url=/v1/tokenLocal
diff --git a/java/src/main/resources/local/application-azure.yml b/java/src/main/resources/local/application-azure.yml
index 89231add..b40c9518 100644
--- a/java/src/main/resources/local/application-azure.yml
+++ b/java/src/main/resources/local/application-azure.yml
@@ -4,7 +4,7 @@ azure:
     enabled: true
   keyvault:
     enabled: false
-    uri: https://amido.stacks-tmp.vault.azure.net/
+    uri: https://ensono.stacks-tmp.vault.azure.net/
     client-id: xxxxxx
     client-key: xxxxxx
     tenant-id: xxxxxx
diff --git a/stackscli.yml b/stackscli.yml
index 9a45c030..0cc7d7d7 100644
--- a/stackscli.yml
+++ b/stackscli.yml
@@ -4,7 +4,7 @@ framework:
   name: java
   commands:
     - name: java
-      version: ">= 11"
+      version: ">= 17"
 
 # Pipeline files
 pipeline:
diff --git a/stacksclipom.xml b/stacksclipom.xml
index 405f762a..7cbff91d 100644
--- a/stacksclipom.xml
+++ b/stacksclipom.xml
@@ -8,8 +8,8 @@
   <version>1.0.0</version>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <main.basedir>.</main.basedir>
     <source.basedir>${main.basedir}/stacks</source.basedir>
     <build.basedir>${main.basedir}/build</build.basedir>