diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7
index 2344c56..5c2de59 100644
--- a/builder/Dockerfile.centos-7
+++ b/builder/Dockerfile.centos-7
@@ -11,8 +11,7 @@ RUN yum -y update \
     gcc-c++ \
     gcc-gfortran \
     gcc-objc \
-    java-1.8.0-openjdk-devel \
-    java-1.8.0-openjdk-headless \
+    java-11-openjdk-devel \
     libICE-devel \
     libSM-devel \
     libX11-devel \
@@ -67,6 +66,9 @@ ENV CONFIGURE_OPTIONS="\
     --with-tk-config=/usr/lib64/tkConfig.sh \
     --enable-prebuilt-html"
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk
+
 # RHEL 7 doesn't have the inconsolata font, so override the defaults.
 ENV R_RD4PDF="times,hyper"
 
diff --git a/builder/Dockerfile.centos-8 b/builder/Dockerfile.centos-8
index a5a0db1..899c3b5 100644
--- a/builder/Dockerfile.centos-8
+++ b/builder/Dockerfile.centos-8
@@ -12,8 +12,7 @@ RUN dnf -y upgrade \
     cairo-devel \
     gcc-c++ \
     gcc-gfortran \
-    java-1.8.0-openjdk-devel \
-    java-1.8.0-openjdk-headless \
+    java-11-openjdk-devel \
     libICE-devel \
     libSM-devel \
     libX11-devel \
@@ -68,6 +67,9 @@ ENV CONFIGURE_OPTIONS="\
     --with-tk-config=/usr/lib64/tkConfig.sh \
     --enable-prebuilt-html"
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk
+
 # RHEL 8 doesn't have the inconsolata font, so override the defaults.
 ENV R_RD4PDF="times,hyper"
 
diff --git a/builder/Dockerfile.debian-10 b/builder/Dockerfile.debian-10
index ea20ef3..c4ba6a2 100644
--- a/builder/Dockerfile.debian-10
+++ b/builder/Dockerfile.debian-10
@@ -17,6 +17,9 @@ RUN chmod 0777 /opt
 # Pin fpm to avoid git dependency in 1.12.0
 RUN gem install fpm:1.11.0
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+
 # Override the default pager used by R
 ENV PAGER /usr/bin/pager
 
diff --git a/builder/Dockerfile.opensuse-153 b/builder/Dockerfile.opensuse-153
index 83b1372..adf6872 100644
--- a/builder/Dockerfile.opensuse-153
+++ b/builder/Dockerfile.opensuse-153
@@ -21,7 +21,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     # added ICU 69 (icu.691-devel) in a patch update. Prefer ICU 69 because the devel
     # packages can't coexist, and zypper now resolves libicu-devel to icu.691-devel.
     icu.691-devel \
-    java-1_8_0-openjdk-devel \
+    java-11-openjdk-devel \
     libX11-devel \
     libXScrnSaver-devel \
     libXmu-devel \
@@ -77,6 +77,9 @@ RUN gem install fpm:1.11.0 && \
 
 RUN chmod 0777 /opt
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk
+
 # Configure flags for SUSE that don't use the defaults in build.sh
 ENV CONFIGURE_OPTIONS="\
     --enable-R-shlib \
diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804
index a2331d4..5fa5ac4 100644
--- a/builder/Dockerfile.ubuntu-1804
+++ b/builder/Dockerfile.ubuntu-1804
@@ -16,6 +16,9 @@ RUN gem install fpm:1.11.0
 
 RUN chmod 0777 /opt
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+
 # Override the default pager used by R
 ENV PAGER /usr/bin/pager
 
diff --git a/builder/Dockerfile.ubuntu-2004 b/builder/Dockerfile.ubuntu-2004
index fa70db0..dc1398a 100644
--- a/builder/Dockerfile.ubuntu-2004
+++ b/builder/Dockerfile.ubuntu-2004
@@ -16,6 +16,9 @@ RUN gem install fpm:1.11.0
 
 RUN chmod 0777 /opt
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+
 # Override the default pager used by R
 ENV PAGER /usr/bin/pager
 
diff --git a/builder/Dockerfile.ubuntu-2204 b/builder/Dockerfile.ubuntu-2204
index 4416aec..2d33c03 100644
--- a/builder/Dockerfile.ubuntu-2204
+++ b/builder/Dockerfile.ubuntu-2204
@@ -15,6 +15,9 @@ RUN gem install fpm
 
 RUN chmod 0777 /opt
 
+# Make sure that patching the OS does not break Java
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+
 # Override the default pager used by R
 ENV PAGER /usr/bin/pager
 
diff --git a/builder/package.centos-7 b/builder/package.centos-7
index 1623d6a..7cb2604 100644
--- a/builder/package.centos-7
+++ b/builder/package.centos-7
@@ -59,6 +59,7 @@ fpm \
   -d xz-devel \
   -d zip \
   -d zlib-devel \
+  -d java-11-openjdk-devel \ 
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.centos-8 b/builder/package.centos-8
index 4568261..3d27cf6 100644
--- a/builder/package.centos-8
+++ b/builder/package.centos-8
@@ -57,6 +57,7 @@ fpm \
   -d xz-devel \
   -d zip \
   -d zlib-devel \
+  -d openjdk-11-devel \
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.debian-10 b/builder/package.debian-10
index f1319fc..5af1038 100644
--- a/builder/package.debian-10
+++ b/builder/package.debian-10
@@ -52,6 +52,7 @@ fpm \
   -d unzip \
   -d zip \
   -d zlib1g-dev \
+  -d openjdk-11-jdk \
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.debian-11 b/builder/package.debian-11
index 27f1d0f..0a4e65d 100644
--- a/builder/package.debian-11
+++ b/builder/package.debian-11
@@ -52,6 +52,7 @@ fpm \
   -d unzip \
   -d zip \
   -d zlib1g-dev \
+  -d openjdk-8-jdk \
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.opensuse-153 b/builder/package.opensuse-153
index fe1a3dc..013e2a4 100644
--- a/builder/package.opensuse-153
+++ b/builder/package.opensuse-153
@@ -68,6 +68,7 @@ fpm \
   -d xz-devel \
   -d zip \
   -d zlib-devel \
+  -d java-11-openjdk-devel \
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index 123d9ed..4bd8978 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -52,6 +52,7 @@ fpm \
   -d unzip \
   -d zip \
   -d zlib1g-dev \
+  -d openjdk-11-jdk \
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.ubuntu-2004 b/builder/package.ubuntu-2004
index 191ce89..3288296 100644
--- a/builder/package.ubuntu-2004
+++ b/builder/package.ubuntu-2004
@@ -53,6 +53,7 @@ fpm \
   -d unzip \
   -d zip \
   -d zlib1g-dev \
+  -d openjdk-11-jdk \
   /opt/R/${R_VERSION}
 
 shopt -s extglob
diff --git a/builder/package.ubuntu-2204 b/builder/package.ubuntu-2204
index b7df72d..59afbad 100644
--- a/builder/package.ubuntu-2204
+++ b/builder/package.ubuntu-2204
@@ -52,6 +52,7 @@ fpm \
   -d unzip \
   -d zip \
   -d zlib1g-dev \
+  -d openjdk-11-jdk \
   /opt/R/${R_VERSION}
 
 shopt -s extglob