diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
index 6128f9c1..7f242e96 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
@@ -36,7 +36,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {
         pluginManager.apply("org.gretty");
 
         project.gretty {
-            servletContainer = 'tomcat85'
+            servletContainer = 'tomcat10'
             contextPath = '/'
             fileLogEnabled = false
         }
diff --git a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle
index 648c491b..5d41c34d 100644
--- a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle
+++ b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
index d2a0069c..decbd82a 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
index f4f18651..c982f832 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
index 1b7feecc..dcb658c1 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
index 139655d0..4ad07398 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
index f1a6ddd6..e076ed32 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
@@ -27,5 +27,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
-	servletContainer = 'tomcat9'
+	servletContainer = 'tomcat10'
 }
diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
index b1c87193..eaea4bad 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
index a3e8c6f8..b9bd3c14 100644
--- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
+++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
index ef51e0ba..4617798f 100644
--- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
+++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
index 139655d0..4ad07398 100644
--- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
+++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }