diff --git a/templates/java-gradle/build.gradle.kts b/templates/java-gradle/build.gradle.kts
index bf0b63f5..1b1981d0 100644
--- a/templates/java-gradle/build.gradle.kts
+++ b/templates/java-gradle/build.gradle.kts
@@ -35,4 +35,10 @@ application {
 
 tasks.named<Test>("test") {
   useJUnitPlatform()
+}
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
 }
\ No newline at end of file
diff --git a/templates/java-gradle/src/test/java/my/example/GreeterTest.java b/templates/java-gradle/src/test/java/my/example/GreeterTest.java
index f7954fe7..4000af49 100644
--- a/templates/java-gradle/src/test/java/my/example/GreeterTest.java
+++ b/templates/java-gradle/src/test/java/my/example/GreeterTest.java
@@ -29,6 +29,6 @@ void testGreet(@RestateClient Client ingressClient) {
     var client = GreeterClient.fromClient(ingressClient);
 
     String response = client.greet("Francesco");
-    assertEquals(response, "Hello Francesco");
+    assertEquals(response, "You said hi to Francesco!");
   }
 }
diff --git a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Utils.java b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Utils.java
index ab2141f7..b522647d 100644
--- a/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Utils.java
+++ b/templates/java-maven-spring-boot/src/main/java/com/example/restatestarter/Utils.java
@@ -1,4 +1,4 @@
-package my.example;
+package com.example.restatestarter;
 
 // You can remove this file.
 // It's only purpose is providing stubs for the template.
diff --git a/templates/java-maven-spring-boot/src/main/resources/application.properties b/templates/java-maven-spring-boot/src/main/resources/application.properties
index a2d62b72..0372747d 100644
--- a/templates/java-maven-spring-boot/src/main/resources/application.properties
+++ b/templates/java-maven-spring-boot/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 spring.application.name=restate-starter
-greetingPrefix=Hello Mr.
+greetingPrefix=hi
 
 # Restate SDK port (to expose Greeter)
 restate.sdk.http.port=9080
diff --git a/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java b/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java
index 107037c4..656b34a8 100644
--- a/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java
+++ b/templates/java-maven-spring-boot/src/test/java/com/example/restatestarter/GreeterTest.java
@@ -19,7 +19,7 @@
 
 @SpringBootTest(
     classes = Greeter.class,
-    properties = {"greetingPrefix=Ciao "})
+    properties = {"greetingPrefix=ciao"})
 @RestateTest
 public class GreeterTest {
 
@@ -30,6 +30,6 @@ public class GreeterTest {
   void greet(@RestateClient Client ingressClient) {
     var client = GreeterClient.fromClient(ingressClient);
 
-    assertThat(client.greet("Francesco")).isEqualTo("Ciao Francesco");
+    assertThat(client.greet("Francesco")).isEqualTo("You said ciao to Francesco!");
   }
 }
diff --git a/templates/java-maven/src/test/java/my/example/GreeterTest.java b/templates/java-maven/src/test/java/my/example/GreeterTest.java
index f7954fe7..4000af49 100644
--- a/templates/java-maven/src/test/java/my/example/GreeterTest.java
+++ b/templates/java-maven/src/test/java/my/example/GreeterTest.java
@@ -29,6 +29,6 @@ void testGreet(@RestateClient Client ingressClient) {
     var client = GreeterClient.fromClient(ingressClient);
 
     String response = client.greet("Francesco");
-    assertEquals(response, "Hello Francesco");
+    assertEquals(response, "You said hi to Francesco!");
   }
 }