diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md
index 22c4fc7660118..a34de48b85ba5 100644
--- a/TROUBLESHOOTING.md
+++ b/TROUBLESHOOTING.md
@@ -46,9 +46,6 @@ apt install openjdk-8-dbg
# Ubuntu/Debian - Java 11
apt install openjdk-11-dbg
-# On CentOS, RHEL and some other RPM-based distributions - Java 8
-debuginfo-install java-1.8.0-openjdk
-
# On CentOS, RHEL and some other RPM-based distributions - Java 11
debuginfo-install java-11-openjdk
```
diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc
index b0914caa5bfae..109fa4675e4a6 100644
--- a/docs/src/main/asciidoc/building-my-first-extension.adoc
+++ b/docs/src/main/asciidoc/building-my-first-extension.adoc
@@ -163,8 +163,8 @@ Your extension is a multi-module project. So let's start by checking out the par
3.8.1
${surefire-plugin.version}
true
- 1.8
- 1.8
+ 11
+ 11
UTF-8
UTF-8
{quarkus-version}
diff --git a/extensions/hibernate-orm/pom.xml b/extensions/hibernate-orm/pom.xml
index 75100dfbfe3b0..ff1f63005ed8e 100644
--- a/extensions/hibernate-orm/pom.xml
+++ b/extensions/hibernate-orm/pom.xml
@@ -45,27 +45,18 @@
- jdk-unsafe-1.8
- jdk-unsafe-9
- jdk-unsafe-10
jdk-unsafe-11
jdk-unsafe-12
jdk-unsafe-13
jdk-unsafe-14
jdk-unsafe-15
- jdk-deprecated-1.8
- jdk-deprecated-9
- jdk-deprecated-10
jdk-deprecated-11
jdk-deprecated-12
jdk-deprecated-13
jdk-deprecated-14
jdk-deprecated-15
- jdk-internal-1.8
- jdk-internal-9
- jdk-internal-10
jdk-internal-11
jdk-internal-12
jdk-internal-13
diff --git a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm b/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm
deleted file mode 100644
index b8da067fe7b15..0000000000000
--- a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm
+++ /dev/null
@@ -1,47 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the docker image run:
-#
-# mvn package
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/code-with-quarkus-jvm .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
-
-ARG JAVA_PACKAGE=java-1.8.0-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-
-# Install java and the run-java script
-# Also set up permissions for user `1001`
-RUN microdnf install openssl curl ca-certificates ${JAVA_PACKAGE} \
- && microdnf update \
- && microdnf clean all \
- && mkdir /deployments \
- && chown 1001 /deployments \
- && chmod "g+rwX" /deployments \
- && chown 1001:root /deployments \
- && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
- && chown 1001 /deployments/run-java.sh \
- && chmod 540 /deployments/run-java.sh \
- && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
-
-# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-
-COPY build/lib/* /deployments/lib/
-COPY build/*-runner.jar /deployments/app.jar
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native b/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native
deleted file mode 100644
index dffcbfe22eb6a..0000000000000
--- a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native
+++ /dev/null
@@ -1,30 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode
-#
-# Before building the docker image run:
-#
-# mvn package -Pnative -Dquarkus.native.container-build=true
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/code-with-quarkus .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
-WORKDIR /work/
-COPY build/*-runner /work/application
-
-# set up permissions for user `1001`
-RUN chmod 775 /work /work/application \
- && chown -R 1001 /work \
- && chmod -R "g+rwX" /work \
- && chown -R 1001:root /work
-
-EXPOSE 8080
-USER 1001
-
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]