diff --git a/.ci/build.sh b/.ci/build.sh
index 6dfc06a0912..b86acfd8cef 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk12}
+JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk13}
 RUNTIME_JAVA_HOME=${RUNTIME_JAVA_HOME:-$HOME/.java/openjdk11}
 
 JAVA7_HOME=$HOME/.java/java7
diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties
index db62e909502..bb6d31684fc 100644
--- a/.ci/java-versions.properties
+++ b/.ci/java-versions.properties
@@ -4,7 +4,7 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=openjdk12
+ES_BUILD_JAVA=openjdk13
 ES_RUNTIME_JAVA=java8
 GRADLE_TASK=build
 GRADLE_EXTRA_ARGS=
diff --git a/.ci/matrix-build-javas.yml b/.ci/matrix-build-javas.yml
index 202fd60edea..49b904f2c32 100644
--- a/.ci/matrix-build-javas.yml
+++ b/.ci/matrix-build-javas.yml
@@ -6,4 +6,4 @@
 # or 'openjdk' followed by the major release number.
 
 ES_BUILD_JAVA:
-  - openjdk12
+  - openjdk13
diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml
index 31cb4eb6b73..d9f69b6c1dc 100644
--- a/.ci/matrix-runtime-javas.yml
+++ b/.ci/matrix-runtime-javas.yml
@@ -9,13 +9,10 @@ ES_RUNTIME_JAVA:
   - java8
   - java8fips
   - java11
-  - java12
-  - openjdk12
   - openjdk13
   - openjdk14
   - zulu8
   - zulu11
-  - zulu12
   - corretto11
   - corretto8
   - adoptopenjdk11
diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
index 9f48efc82d6..759a3aae9ae 100755
--- a/.ci/packer_cache.sh
+++ b/.ci/packer_cache.sh
@@ -20,6 +20,7 @@ export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
 # We are caching BWC versions too, need these so we can build those
 export JAVA8_HOME="${HOME}"/.java/java8
 export JAVA11_HOME="${HOME}"/.java/java11
-export JAVA12_HOME="${HOME}"/.java/java12
+export JAVA12_HOME="${HOME}"/.java/openjdk12
+export JAVA13_HOME="${HOME}"/.java/openjdk13
 ./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aa95be59f01..1977f147768 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,16 +92,16 @@ Contributing to the Elasticsearch codebase
 
 **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
 
-JDK 12 is required to build Elasticsearch. You must have a JDK 12 installation
+JDK 13 is required to build Elasticsearch. You must have a JDK 13 installation
 with the environment variable `JAVA_HOME` referencing the path to Java home for
-your JDK 12 installation. By default, tests use the same runtime as `JAVA_HOME`.
+your JDK 13 installation. By default, tests use the same runtime as `JAVA_HOME`.
 However, since Elasticsearch supports JDK 8, the build supports compiling with
-JDK 12 and testing on a JDK 8 runtime; to do this, set `RUNTIME_JAVA_HOME`
+JDK 13 and testing on a JDK 8 runtime; to do this, set `RUNTIME_JAVA_HOME`
 pointing to the Java home of a JDK 8 installation. Note that this mechanism can
 be used to test against other JDKs as well, this is not only limited to JDK 8.
 
 > Note: It is also required to have `JAVA8_HOME`, `JAVA9_HOME`, `JAVA10_HOME`
-and `JAVA11_HOME` available so that the tests can pass.
+and `JAVA11_HOME`, and `JAVA12_HOME` available so that the tests can pass.
 
 > Warning: do not use `sdkman` for Java installations which do not have proper
 `jrunscript` for jdk distributions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java
index 70f80c1695d..f98be169323 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java
@@ -73,7 +73,7 @@ import static org.elasticsearch.gradle.vagrant.VagrantMachine.convertWindowsPath
 public class DistroTestPlugin implements Plugin<Project> {
     private static final Logger logger = Logging.getLogger(DistroTestPlugin.class);
 
-    private static final String GRADLE_JDK_VERSION = "12.0.1+12@69cfe15208a647278a19ef0990eea691";
+    private static final String GRADLE_JDK_VERSION = "13.0.1+9@cec27d702aa74d5a8630c65ae61e4305";    
     private static final String GRADLE_JDK_VENDOR = "openjdk";
 
     // all distributions used by distro tests. this is temporary until tests are per distribution
diff --git a/buildSrc/src/main/resources/minimumCompilerVersion b/buildSrc/src/main/resources/minimumCompilerVersion
index 35d51f33b34..b1bd38b62a0 100644
--- a/buildSrc/src/main/resources/minimumCompilerVersion
+++ b/buildSrc/src/main/resources/minimumCompilerVersion
@@ -1 +1 @@
-1.12
\ No newline at end of file
+13