diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 6cf5df47eff..eea99b8702b 100644
--- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 3cbabe61ca3..76a7b85824b 100644
--- a/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
index 0fd96f479be..b5b3234bf57 100644
--- a/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
+++ b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application in $(jetty.home)/webapps/test
diff --git a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml
index d2532f2aa49..c9595b71ce3 100644
--- a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml
+++ b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!-- Simple handler to redirect from old path to new -->
 <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">
diff --git a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 45494237c4d..28127c882b6 100644
--- a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml b/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml
index 6c5fb66485d..767b0a0042e 100644
--- a/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml
+++ b/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
index 745f8a7f5d2..3295cd62306 100644
--- a/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
+++ b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml
index 20ba11f7391..27829769c0e 100644
--- a/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml
+++ b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
index 3ae653cd23c..44f95010e76 100644
--- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 2755401a915..4da3d62237c 100644
--- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 1d81b215e87..169c0f903ad 100644
--- a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/demos/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml b/demos/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml
index 432ed7ce857..76779a891d7 100644
--- a/demos/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml
+++ b/demos/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/test-spec</Set>
diff --git a/demos/demo-spec-webapp/src/main/templates/annotations-context-header.xml b/demos/demo-spec-webapp/src/main/templates/annotations-context-header.xml
index dc0080cc9cb..e5fb833ce02 100644
--- a/demos/demo-spec-webapp/src/main/templates/annotations-context-header.xml
+++ b/demos/demo-spec-webapp/src/main/templates/annotations-context-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->
diff --git a/demos/demo-spec-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-spec-webapp/src/main/templates/plugin-context-header.xml
index ef5e00dfde6..de0c0c9f69c 100644
--- a/demos/demo-spec-webapp/src/main/templates/plugin-context-header.xml
+++ b/demos/demo-spec-webapp/src/main/templates/plugin-context-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->
diff --git a/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
index f0791e637cd..c3b96ec098b 100644
--- a/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
diff --git a/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index d75a82a5097..4893c6fa3de 100644
--- a/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/demos/demo-spec-webapp/src/test/jetty-plugin-env.xml b/demos/demo-spec-webapp/src/test/jetty-plugin-env.xml
index bf3aef8c569..f3724c601b4 100644
--- a/demos/demo-spec-webapp/src/test/jetty-plugin-env.xml
+++ b/demos/demo-spec-webapp/src/test/jetty-plugin-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
 
diff --git a/examples/embedded/src/main/resources/exampleserver.xml b/examples/embedded/src/main/resources/exampleserver.xml
index b3940b8f20a..d480f86e163 100644
--- a/examples/embedded/src/main/resources/exampleserver.xml
+++ b/examples/embedded/src/main/resources/exampleserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/examples/embedded/src/main/resources/fileserver.xml b/examples/embedded/src/main/resources/fileserver.xml
index 0f9be210fce..6f67e8d4cdc 100644
--- a/examples/embedded/src/main/resources/fileserver.xml
+++ b/examples/embedded/src/main/resources/fileserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 
 <Configure id="FileServer" class="org.eclipse.jetty.server.Server">