diff --git a/servlet/java-configuration/aspectj/gradle.properties b/servlet/java-configuration/aspectj/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/aspectj/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/aspectj/gradle/gretty.gradle b/servlet/java-configuration/aspectj/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/aspectj/gradle/gretty.gradle
+++ b/servlet/java-configuration/aspectj/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/preauth/gradle.properties b/servlet/java-configuration/authentication/preauth/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/preauth/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle b/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml b/servlet/java-configuration/authentication/preauth/server/tomcat-users.xml
similarity index 100%
rename from servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml
rename to servlet/java-configuration/authentication/preauth/server/tomcat-users.xml
diff --git a/servlet/java-configuration/authentication/remember-me/gradle.properties b/servlet/java-configuration/authentication/remember-me/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/remember-me/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle b/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/form/gradle.properties b/servlet/java-configuration/authentication/username-password/form/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/form/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/in-memory/gradle.properties b/servlet/java-configuration/authentication/username-password/in-memory/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/in-memory/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/jdbc/gradle.properties b/servlet/java-configuration/authentication/username-password/jdbc/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/jdbc/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/ldap/gradle.properties b/servlet/java-configuration/authentication/username-password/ldap/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/ldap/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/x509/gradle.properties b/servlet/java-configuration/authentication/x509/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/x509/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/x509/gradle/gretty.gradle b/servlet/java-configuration/authentication/x509/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/x509/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/x509/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/data/gradle.properties b/servlet/java-configuration/data/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/data/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-mvc-security/gradle.properties b/servlet/java-configuration/hello-mvc-security/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/hello-mvc-security/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle b/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
+++ b/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/hello-security-explicit/gradle.properties b/servlet/java-configuration/hello-security-explicit/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/hello-security-explicit/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle b/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
+++ b/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/hello-security/gradle.properties b/servlet/java-configuration/hello-security/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/hello-security/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-security/gradle/gretty.gradle b/servlet/java-configuration/hello-security/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/hello-security/gradle/gretty.gradle
+++ b/servlet/java-configuration/hello-security/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/max-sessions/gradle.properties b/servlet/java-configuration/max-sessions/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/max-sessions/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/max-sessions/gradle/gretty.gradle b/servlet/java-configuration/max-sessions/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/max-sessions/gradle/gretty.gradle
+++ b/servlet/java-configuration/max-sessions/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'