diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index bd0f28066a..d67388d7a0 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -16,8 +16,8 @@
     <app.deploy.project>libphonenumber-hrd</app.deploy.project>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <archiveClasses>true</archiveClasses>
     <soy.root>${project.basedir}/src/main/resources/com/google/phonenumbers/demo</soy.root>
diff --git a/java/demo/src/main/webapp/WEB-INF/appengine-web.xml b/java/demo/src/main/webapp/WEB-INF/appengine-web.xml
index 1a367eca3a..5a7e622c4b 100644
--- a/java/demo/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/java/demo/src/main/webapp/WEB-INF/appengine-web.xml
@@ -2,7 +2,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>libphonenumber-hrd</application>
   <version>1</version>
-  <runtime>java8</runtime>
+  <runtime>java11</runtime>
   <threadsafe>true</threadsafe>
 
   <!-- Configure java.util.logging -->