diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee9-env.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee8-env.xml
similarity index 100%
rename from jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee9-env.xml
rename to jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee8-env.xml
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
similarity index 100%
rename from jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
rename to jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod
index fde0040631a..f2393e14429 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-demo-async-rest.mod
@@ -14,5 +14,6 @@ webapp
 ee10-deploy
 
 [files]
+basehome:modules/demo.d/ee10-demo-async-rest.properties|webapps/ee10-demo-async-rest.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-async-rest-webapp/${jetty.version}/war|webapps/ee10-demo-async-rest.war
 
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-demo-async-rest.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-demo-async-rest.mod
index 45eea7f48a9..292105309b7 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-demo-async-rest.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-demo-async-rest.mod
@@ -14,5 +14,6 @@ webapp
 ee11-deploy
 
 [files]
+basehome:modules/demo.d/ee11-demo-async-rest.properties|webapps/ee11-demo-async-rest.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-async-rest-webapp/${jetty.version}/war|webapps/ee11-demo-async-rest.war
 
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod
index 90a5d754d0c..e90d12e0ccf 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod
@@ -21,4 +21,6 @@ ext
 
 [files]
 basehome:modules/demo.d/ee10-demo-jaas.xml|webapps/ee10-demo-jaas.xml
+basehome:modules/demo.d/ee10-demo-jaas.properties|webapps/ee10-demo-jaas.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-jaas-webapp/${jetty.version}/war|webapps/ee10-demo-jaas.war
+
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod
index e248dff3048..15dd85dc030 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod
@@ -21,4 +21,5 @@ ext
 
 [files]
 basehome:modules/demo.d/ee11-demo-jaas.xml|webapps/ee11-demo-jaas.xml
+basehome:modules/demo.d/ee11-demo-jaas.properties|webapps/ee11-demo-jaas.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-jaas-webapp/${jetty.version}/war|webapps/ee11-demo-jaas.war
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.properties b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.properties
new file mode 100644
index 00000000000..7f4782eb5c7
--- /dev/null
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.properties
@@ -0,0 +1 @@
+environment: ee10
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.properties b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.properties
new file mode 100644
index 00000000000..5c25b5bb012
--- /dev/null
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.properties
@@ -0,0 +1 @@
+environment: ee11
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.properties b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.properties
new file mode 100644
index 00000000000..17a01425df9
--- /dev/null
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.properties
@@ -0,0 +1 @@
+environment: ee9
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
index 9dc6cbc53b3..a4e3639292f 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
@@ -20,6 +20,7 @@ ee10-demo-mock-resources
 
 [files]
 basehome:modules/demo.d/ee10-demo-jndi.xml|webapps/ee10-demo-jndi.xml
+basehome:modules/demo.d/ee10-demo-jndi.properties|webapps/ee10-demo-jndi.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-jndi-webapp/${jetty.version}/war|webapps/ee10-demo-jndi.war
 maven://jakarta.mail/jakarta.mail-api/@ee10.jakarta.mail.api.version@/jar|lib/ee10/jakarta.mail-api-@ee10.jakarta.mail.api.version@.jar
 maven://jakarta.activation/jakarta.activation-api/@ee10.jakarta.activation.api.version@/jar|lib/ee10/jakarta.activation-api-@ee10.jakarta.activation.api.version@.jar
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod
index 25848cf7333..11f380e63fd 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod
@@ -20,6 +20,7 @@ ee11-demo-mock-resources
 
 [files]
 basehome:modules/demo.d/ee11-demo-jndi.xml|webapps/ee11-demo-jndi.xml
+basehome:modules/demo.d/ee11-demo-jndi.properties|webapps/ee11-demo-jndi.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-jndi-webapp/${jetty.version}/war|webapps/ee11-demo-jndi.war
 maven://jakarta.mail/jakarta.mail-api/@ee11.jakarta.mail.api.version@/jar|lib/ee11/jakarta.mail-api-@ee11.jakarta.mail.api.version@.jar
 maven://jakarta.activation/jakarta.activation-api/@ee11.jakarta.activation.api.version@/jar|lib/ee11/jakarta.activation-api-@ee11.jakarta.activation.api.version@.jar
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
index 96e5f5827c3..d07c26c0ee6 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
@@ -23,7 +23,7 @@ basehome:modules/demo.d/ee9-demo-jndi.xml|webapps/ee9-demo-jndi.xml
 basehome:modules/demo.d/ee9-demo-jndi.properties|webapps/ee9-demo-jndi.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-jndi-webapp/${jetty.version}/war|webapps/ee9-demo-jndi.war
 maven://jakarta.mail/jakarta.mail-api/@ee9.jakarta.mail.api.version@/jar|lib/ee9/jakarta.mail-api-@ee9.jakarta.mail.api.version@.jar
-        maven://jakarta.activation/jakarta.activation-api/@ee9.jakarta.activation.api.version@/jar|lib/ee9/jakarta.activation-api-@ee9.jakarta.activation.api.version@.jar
+maven://jakarta.activation/jakarta.activation-api/@ee9.jakarta.activation.api.version@/jar|lib/ee9/jakarta.activation-api-@ee9.jakarta.activation.api.version@.jar
 
 [lib]
 lib/ee9/jakarta.mail-api-@ee9.jakarta.mail.api.version@.jar
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-simple-webapp/src/main/config/modules/ee10-demo-simple.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-simple-webapp/src/main/config/modules/ee10-demo-simple.mod
index 13f5d912e81..8bb270706a8 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-simple-webapp/src/main/config/modules/ee10-demo-simple.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-simple-webapp/src/main/config/modules/ee10-demo-simple.mod
@@ -12,4 +12,5 @@ webapp
 ee10-deploy
 
 [files]
+basehome:modules/demo.d/ee10-demo-simple.properties|webapps/ee10-demo-simple.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-simple-webapp/${jetty.version}/war|webapps/ee10-demo-simple.war
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod
index e525e83e18d..eb46bd605ff 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod
@@ -21,4 +21,5 @@ ee10-demo-mock-resources
 
 [files]
 basehome:modules/demo.d/ee10-demo-spec.xml|webapps/ee10-demo-spec.xml
+basehome:modules/demo.d/ee10-demo-spec.properties|webapps/ee10-demo-spec.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-spec-webapp/${jetty.version}/war|webapps/ee10-demo-spec.war
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod
index 133a2351f36..0674235b63c 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod
@@ -21,4 +21,5 @@ ee11-demo-mock-resources
 
 [files]
 basehome:modules/demo.d/ee11-demo-spec.xml|webapps/ee11-demo-spec.xml
+basehome:modules/demo.d/ee11-demo-spec.properties|webapps/ee11-demo-spec.properties
 maven://org.eclipse.jetty.demos/jetty-servlet5-demo-spec-webapp/${jetty.version}/war|webapps/ee11-demo-spec.war
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.properties b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.properties
new file mode 100644
index 00000000000..7f4782eb5c7
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.properties
@@ -0,0 +1 @@
+environment: ee10
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod
index 75caab7b0eb..510168fe004 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod
@@ -17,5 +17,5 @@ ee10-websocket-jetty
 
 [files]
 basehome:modules/demo.d/ee10-demo-jetty-websocket.xml|webapps/ee10-demo-jetty-websocket.xml
-basehome:modules/demo.d/ee10-demo-jetty.properties|webapps/ee10-demo-jetty-websocket.properties
+basehome:modules/demo.d/ee10-demo-jetty-websocket.properties|webapps/ee10-demo-jetty-websocket.properties
 maven://org.eclipse.jetty.demos/jetty-ee10-demo-jetty-websocket/webapp/${jetty.version}/war|webapps/ee10-demo-jetty-websocket.war
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/demo.d/ee10-demo-proxy.properties b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/demo.d/ee10-demo-proxy.properties
new file mode 100644
index 00000000000..7f4782eb5c7
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/demo.d/ee10-demo-proxy.properties
@@ -0,0 +1 @@
+environment: ee10
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod
index ae219aea510..061f39a0271 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod
@@ -14,4 +14,5 @@ webapp
 ee10-deploy
 
 [files]
+basehome:modules/demo.d/ee10-demo-proxy.properties|webapps/ee10-demo-proxy.properties
 maven://org.eclipse.jetty.ee10.demos/jetty-ee10-demo-proxy-webapp/${jetty.version}/war|webapps/ee10-demo-proxy.war
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.properties b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.properties
new file mode 100644
index 00000000000..5c25b5bb012
--- /dev/null
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.properties
@@ -0,0 +1 @@
+environment: ee11
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod
index e64728d8cc4..5991edf20df 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod
@@ -17,5 +17,5 @@ ee11-websocket-jetty
 
 [files]
 basehome:modules/demo.d/ee11-demo-jetty-websocket.xml|webapps/ee11-demo-jetty-websocket.xml
-basehome:modules/demo.d/ee11-demo-jetty.properties|webapps/ee11-demo-jetty-websocket.properties
+basehome:modules/demo.d/ee11-demo-jetty-websocket.properties|webapps/ee11-demo-jetty-websocket.properties
 maven://org.eclipse.jetty.demos/jetty-ee11-demo-jetty-websocket/webapp/${jetty.version}/war|webapps/ee11-demo-jetty-websocket.war
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/demo.d/ee11-demo-proxy.properties b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/demo.d/ee11-demo-proxy.properties
new file mode 100644
index 00000000000..5c25b5bb012
--- /dev/null
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/demo.d/ee11-demo-proxy.properties
@@ -0,0 +1 @@
+environment: ee11
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod
index 1156edf0abc..ca4cc7c40c9 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod
@@ -14,4 +14,5 @@ webapp
 ee11-deploy
 
 [files]
+basehome:modules/demo.d/ee11-demo-proxy.properties|webapps/ee11-demo-proxy.properties
 maven://org.eclipse.jetty.ee11.demos/jetty-ee11-demo-proxy-webapp/${jetty.version}/war|webapps/ee11-demo-proxy.war
diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.properties b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.properties
new file mode 100644
index 00000000000..01902893d61
--- /dev/null
+++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.properties
@@ -0,0 +1 @@
+environment: ee8
diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod
index f70550bb2f6..3f3e66e18c8 100644
--- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod
+++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod
@@ -17,5 +17,5 @@ ee8-websocket-jetty
 
 [files]
 basehome:modules/demo.d/ee8-demo-jetty-websocket.xml|webapps/ee8-demo-jetty-websocket.xml
-basehome:modules/demo.d/ee8-demo-jetty.properties|webapps/ee8-demo-jetty-websocket.properties
+basehome:modules/demo.d/ee8-demo-jetty-websocket.properties|webapps/ee8-demo-jetty-websocket.properties
 maven://org.eclipse.jetty.ee8.demos/jetty-ee8-demo-jetty-websocket/webapp/${jetty.version}/war|webapps/ee8-demo-jetty-websocket.war
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.properties b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.properties
new file mode 100644
index 00000000000..17a01425df9
--- /dev/null
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.properties
@@ -0,0 +1 @@
+environment: ee9
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod
index 95fac7ed470..46a4d78e6f3 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod
@@ -17,5 +17,5 @@ ee9-websocket-jetty
 
 [files]
 basehome:modules/demo.d/ee9-demo-jetty-websocket.xml|webapps/ee9-demo-jetty-websocket.xml
-basehome:modules/demo.d/ee9-demo-jetty.properties|webapps/ee9-demo-jetty-websocket.properties
+basehome:modules/demo.d/ee9-demo-jetty-websocket.properties|webapps/ee9-demo-jetty-websocket.properties
 maven://org.eclipse.jetty.ee9.demos/jetty-ee9-demo-jetty-websocket/webapp/${jetty.version}/war|webapps/ee9-demo-jetty-websocket.war