diff --git a/.github/composite-actions/install-dependencies/action.yml b/.github/composite-actions/install-dependencies/action.yml
index e531d9f8db..de0912e518 100644
--- a/.github/composite-actions/install-dependencies/action.yml
+++ b/.github/composite-actions/install-dependencies/action.yml
@@ -9,7 +9,7 @@ runs:
         curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
         sudo apt-get update --fix-missing -y
-        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python3-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libsybdb5 freetds-dev freetds-common gdal-bin libgdal-dev libgeos-dev gdb libkrb5-dev
+        sudo apt-get install uuid-dev openjdk-21-jre libicu-dev libxml2-dev openssl libssl-dev python3-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libsybdb5 freetds-dev freetds-common gdal-bin libgdal-dev libgeos-dev gdb libkrb5-dev
         sudo apt install -y ccache
         sudo apt-get install lcov
         sudo /usr/sbin/update-ccache-symlinks
diff --git a/INSTALLING.md.tmpl b/INSTALLING.md.tmpl
index 3d2311ed94..7a099bf0f5 100644
--- a/INSTALLING.md.tmpl
+++ b/INSTALLING.md.tmpl
@@ -29,7 +29,7 @@ sudo apt-get update && sudo apt install -y --no-install-recommends \
   cmake lld apt-utils libossp-uuid-dev gnulib bison \
   xsltproc icu-devtools libicu66 \
   libicu-dev gawk \
-  curl openjdk-8-jre openssl \
+  curl openjdk-21-jre openssl \
   g++ libssl-dev python-dev libpq-dev \
   pkg-config libutfcpp-dev \
   gnupg unixodbc-dev net-tools unzip
diff --git a/contrib/README.md b/contrib/README.md
index 04b884c351..fd98bd8108 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -27,7 +27,7 @@ The following build instructions comply with Ubuntu 20.04 and Amazon Linux 2 env
     You'll also need to install `gcc`, `gcc-c++`, `java` and `bison`.
     
     ```
-    sudo apt-get install uuid-dev openjdk-8-jre \
+    sudo apt-get install uuid-dev openjdk-21-jre \
                         libicu-dev libxml2-dev openssl libssl-dev python-dev \
                         libossp-uuid-dev libpq-dev pkg-config g++ build-essential bison 
     ```