diff --git a/apps/jetty/java/src/net/i2p/servlet/WebAppProviderConfiguration.java b/apps/jetty/java/src/net/i2p/servlet/WebAppProviderConfiguration.java
index a8c908c6f..2607c311b 100644
--- a/apps/jetty/java/src/net/i2p/servlet/WebAppProviderConfiguration.java
+++ b/apps/jetty/java/src/net/i2p/servlet/WebAppProviderConfiguration.java
@@ -25,7 +25,7 @@ public class WebAppProviderConfiguration {
     public static void configure(ContextProvider wap) {
         // Not in Jetty 12 but these are the two defaults
         //String[] classNames = WebAppContext.getDefaultConfigurationClasses();
-        String[] classNames = { "org.eclipse.jetty.ee8.webapp.WebXMLConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXMLConfiguration" };
+        String[] classNames = { "org.eclipse.jetty.ee8.webapp.WebXmlConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXmlConfiguration" };
         int sz = classNames.length;
         String[] newClassNames = new String[sz + 1];
         for (int j = 0; j < sz; j++) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index c365e1b80..dcbac8aa8 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -206,7 +206,7 @@ public class WebAppStarter {
         if (classNames.length == 0) {
             //classNames = wac.getDefaultConfigurationClasses();
             // These are the defaults as documented in WebAppContext
-            classNames = new String[] { "org.eclipse.jetty.ee8.webapp.WebXMLConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXMLConfiguration" };
+            classNames = new String[] { "org.eclipse.jetty.ee8.webapp.WebXmlConfiguration", "org.eclipse.jetty.ee8.webapp.JettyWebXmlConfiguration" };
         }
         List<String> newClassNames = new ArrayList<String>(Arrays.asList(classNames));
         for (String name : newClassNames) {
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index 02f8854cb..2ab0d3aad 100644
--- a/installer/resources/eepsite/jetty.xml
+++ b/installer/resources/eepsite/jetty.xml
@@ -182,6 +182,29 @@
       </Arg>
     </Call>
 
+    <!-- Setup ee8 environment -->
+    <!-- First call needed to initialize the class and prevent NPE -->
+    <Call class="org.eclipse.jetty.util.component.Environment" name="get" >
+        <Arg>foo</Arg>
+    </Call>
+    <New id="EBuilder" class="org.eclipse.jetty.xml.EnvironmentBuilder" >
+      <Arg>ee8</Arg>
+    </New>
+    <Ref refid="EBuilder">
+      <Call id="Environment" name="build" />
+    </Ref>
+    <Ref refid="Environment">
+      <Call class="org.eclipse.jetty.util.Attributes" name="setAttribute">
+        <Arg>contextHandlerClass</Arg>
+        <Arg>org.eclipse.jetty.ee8.webapp.WebAppContext</Arg>
+      </Call>
+    </Ref>
+    <Call class="org.eclipse.jetty.util.component.Environment" name="set" >
+      <Arg>
+        <Ref refid="Environment"/>
+      </Arg>
+    </Call>
+
     <!-- =========================================================== -->
     <!-- Configure the context deployer                              -->
     <!-- A context deployer will deploy contexts described in        -->