diff --git a/public-api/build.gradle b/public-api/build.gradle
index bea550338..840eb9bdb 100644
--- a/public-api/build.gradle
+++ b/public-api/build.gradle
@@ -398,6 +398,7 @@ dependencies {
     generatedCompile "com.google.code.gson:gson:${GSON_VERSION}"
     generatedCompile 'joda-time:joda-time:2.10'
     generatedCompile "com.fasterxml.jackson.datatype:jackson-datatype-joda:${JACKSON_VERSION}"
+    generatedCompile "javax.xml.bind:jaxb-api:2.3.1"
 }
 
 swaggerSources {
diff --git a/public-api/src/dev/server/Dockerfile b/public-api/src/dev/server/Dockerfile
index 6ba46126b..0616cffcf 100644
--- a/public-api/src/dev/server/Dockerfile
+++ b/public-api/src/dev/server/Dockerfile
@@ -5,7 +5,7 @@ FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
-     openjdk-8-jdk \
+     openjdk-11-jdk \
      curl \
      python2 \
      python3 \
diff --git a/public-api/src/main/webapp/WEB-INF/appengine-web.xml.template b/public-api/src/main/webapp/WEB-INF/appengine-web.xml.template
index ba35e1299..f588a23c3 100644
--- a/public-api/src/main/webapp/WEB-INF/appengine-web.xml.template
+++ b/public-api/src/main/webapp/WEB-INF/appengine-web.xml.template
@@ -1,6 +1,22 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <service>api</service>
-  <runtime>java8</runtime>
+  <runtime>java11</runtime>
+
+  <!--
+  The GAE java8 runtime restricts certain JVM APIs. The java11 runtime has fewer restrictions.
+  Google provides GAE-specific libraries to work around these restrictions, but using these
+  libraries on the java11 runtime throws a:
+    com.google.apphosting.api.ApiProxy$FeatureNotEnabledException
+
+  See:
+    https://cloud.google.com/appengine/docs/standard/bundled-services-overview
+    https://cloud.google.com/appengine/docs/standard/java-gen2/services/access
+    https://www.googlecloudcommunity.com/gc/Serverless/FeatureNotEnabledException-using-App-Engine-bundled-service/m-p/181253
+
+  The following flag enables these libraries in the java11 runtime, allowing us to migrate away
+  from them in subsequent steps.
+  -->
+  <app-engine-apis>true</app-engine-apis>
   <threadsafe>true</threadsafe>
   <!-- Deploy complains about this tag, bug BigQuery needs it. -->
   <application>aou-db-test</application>