diff --git a/buildspec.yml b/buildspec.yml
index 73343ded7..211cfd223 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -2,7 +2,7 @@
 version: 0.2
 phases:
   install:
-    runtimeversion: java:openjdk8
+    runtimeversion: java:openjdk16
   pre_build:
     commands:
       - echo Nothing to do in prebuild
diff --git a/pom.xml b/pom.xml
index bb13eb3b0..9f76bfc0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   <properties>
 
     <!-- Generic properties -->
-    <java.version>11</java.version>
+    <java.version>16</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- Important for reproducible builds. Update using e.g. ./mvnw versions:set -DnewVersion=... -->