diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 582917f..1b58243 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,13 +28,6 @@ jobs:
           ## Ubuntu 20.04
           - context: openjdk-17/ubuntu/20.04
             imageTag: 17-ubuntu-20,17-ubuntu-2004,openjdk-17-ubuntu-20,openjdk-17-ubuntu-2004
-          # JDK 14
-          ## Ubuntu 22.04
-          - context: openjdk-14/ubuntu/22.04
-            imageTag: 14,14-ubuntu,14-ubuntu-22,14-ubuntu-2204,openjdk-14,openjdk-14-ubuntu,openjdk-14-ubuntu-22,openjdk-14-ubuntu-2204
-          ## Ubuntu 20.04
-          - context: openjdk-14/ubuntu/20.04
-            imageTag: 14-ubuntu-20,14-ubuntu-2004,openjdk-14-ubuntu-20,openjdk-14-ubuntu-2004
           # JDK 11
           ## Ubuntu 22.04
           - context: openjdk-11/ubuntu/22.04
diff --git a/README.md b/README.md
index 2733036..7ce1e24 100644
--- a/README.md
+++ b/README.md
@@ -5,22 +5,20 @@
 
 | JDK version                             | Docker tags                                                                         | Dockerfile                                                                       |
 |-----------------------------------------|----------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
-| openjdk-21 ( 21.0.2 ) + Ubuntu 24.04 | `openjdk-21`, `openjdk-21-ubuntu`, `openjdk-21-ubuntu-24`, `openjdk-21-ubuntu-2404`,`latest`    | *[( openjdk-21/ubuntu/24.04/Dockerfile )](./openjdk-21/ubuntu/24.04/Dockerfile)* |
-| openjdk-21 ( 21.0.2 ) + Ubuntu 22.04 | `openjdk-21-ubuntu-22`, `openjdk-21-ubuntu-2204`                                                | *[( openjdk-21/ubuntu/22.04/Dockerfile )](./openjdk-21/ubuntu/22.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 22.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`    | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
-| openjdk-14 ( 14.0.2 ) + Ubuntu 22.04 | `openjdk-14`, `openjdk-14-ubuntu`, `openjdk-14-ubuntu-22`, `openjdk-14-ubuntu-2204`             | *[( openjdk-14/ubuntu/22.04/Dockerfile )](./openjdk-14/ubuntu/22.04/Dockerfile)* |
-| openjdk-11 ( 11.0.19 ) + Ubuntu 22.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-22`, `openjdk-11-ubuntu-2204`            | *[( openjdk-11/ubuntu/22.04/Dockerfile )](./openjdk-11/ubuntu/22.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 24.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-24`, `openjdk-17-ubuntu-2404`             | *[( openjdk-17/ubuntu/24.04/Dockerfile )](./openjdk-17/ubuntu/24.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 22.04 | `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`                                                | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
-| openjdk-17 ( 17.0.10 ) + Ubuntu 20.04 | `openjdk-17-ubuntu-20`, `openjdk-17-ubuntu-2004`                                               | *[( openjdk-17/ubuntu/20.04/Dockerfile )](./openjdk-17/ubuntu/20.04/Dockerfile)* |
-| openjdk-14 ( 14.0.2 ) + Ubuntu 20.04 | `openjdk-14`, `openjdk-14-ubuntu`, `openjdk-14-ubuntu-20`, `openjdk-14-ubuntu-2004`             | *[( openjdk-14/ubuntu/20.04/Dockerfile )](./openjdk-14/ubuntu/20.04/Dockerfile)* |
-| openjdk-11 ( 11.0.19 ) + Ubuntu 20.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-20`, `openjdk-11-ubuntu-2004`            | *[( openjdk-11/ubuntu/20.04/Dockerfile )](./openjdk-11/ubuntu/20.04/Dockerfile)* |
+| openjdk-21 + Ubuntu 24.04 | `openjdk-21`, `openjdk-21-ubuntu`, `openjdk-21-ubuntu-24`, `openjdk-21-ubuntu-2404`,`latest`    | *[( openjdk-21/ubuntu/24.04/Dockerfile )](./openjdk-21/ubuntu/24.04/Dockerfile)* |
+| openjdk-21 + Ubuntu 22.04 | `openjdk-21-ubuntu-22`, `openjdk-21-ubuntu-2204`                                                | *[( openjdk-21/ubuntu/22.04/Dockerfile )](./openjdk-21/ubuntu/22.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 22.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`    | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
+| openjdk-11 + Ubuntu 22.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-22`, `openjdk-11-ubuntu-2204`            | *[( openjdk-11/ubuntu/22.04/Dockerfile )](./openjdk-11/ubuntu/22.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 24.04 | `openjdk-17`, `openjdk-17-ubuntu`, `openjdk-17-ubuntu-24`, `openjdk-17-ubuntu-2404`             | *[( openjdk-17/ubuntu/24.04/Dockerfile )](./openjdk-17/ubuntu/24.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 22.04 | `openjdk-17-ubuntu-22`, `openjdk-17-ubuntu-2204`                                                | *[( openjdk-17/ubuntu/22.04/Dockerfile )](./openjdk-17/ubuntu/22.04/Dockerfile)* |
+| openjdk-17 + Ubuntu 20.04 | `openjdk-17-ubuntu-20`, `openjdk-17-ubuntu-2004`                                               | *[( openjdk-17/ubuntu/20.04/Dockerfile )](./openjdk-17/ubuntu/20.04/Dockerfile)* |
+| openjdk-11 + Ubuntu 20.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-20`, `openjdk-11-ubuntu-2004`            | *[( openjdk-11/ubuntu/20.04/Dockerfile )](./openjdk-11/ubuntu/20.04/Dockerfile)* |
 | 8 ( 8u342 ) + Ubuntu 20.04              | `8`, `8-ubuntu`, `8-ubuntu-20`, `8-ubuntu-2004`                                              | *[( 8/ubuntu/20.04/Dockerfile )](./8/ubuntu/18.04/Dockerfile)*    
-| openjdk-11 ( 11.0.19+7 ) + Ubuntu 18.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-18`, `openjdk-11-ubuntu-1804`          | *[( openjdk-11/ubuntu/18.04/Dockerfile )](./openjdk-11/ubuntu/18.04/Dockerfile)* |
+| openjdk-11 + Ubuntu 18.04 | `openjdk-11`, `openjdk-11-ubuntu`, `openjdk-11-ubuntu-18`, `openjdk-11-ubuntu-1804`          | *[( openjdk-11/ubuntu/18.04/Dockerfile )](./openjdk-11/ubuntu/18.04/Dockerfile)* |
 | 8 ( 8u201 ) + Ubuntu 18.04              | `8`, `8-ubuntu`, `8-ubuntu-18`, `8-ubuntu-1804`                                              | *[( 8/ubuntu/18.04/Dockerfile )](./8/ubuntu/18.04/Dockerfile)*                   |
 | 8 ( 8u201 ) + Ubuntu 16.04              | `8-ubuntu-1604`, `8-ubuntu-16`                                                               | *[( 8/ubuntu/16.04/Dockerfile )](./8/ubuntu/16.04/Dockerfile)*     
-| openjdk-8( 8u342b07 ) + Ubuntu 20.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-20`, `openjdk-8-ubuntu-2004`              | *[( openjdk-8/ubuntu/20.04/Dockerfile )](./openjdk-8/ubuntu/20.04/Dockerfile)*   |
-| openjdk-8( 8u222b10 ) + Ubuntu 18.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-18`, `openjdk-8-ubuntu-1804`              | *[( openjdk-8/ubuntu/18.04/Dockerfile )](./openjdk-8/ubuntu/18.04/Dockerfile)*   |
+| openjdk-8 + Ubuntu 20.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-20`, `openjdk-8-ubuntu-2004`              | *[( openjdk-8/ubuntu/20.04/Dockerfile )](./openjdk-8/ubuntu/20.04/Dockerfile)*   |
+| openjdk-8 + Ubuntu 18.04    | `openjdk-8`, `openjdk-8-ubuntu`, `openjdk-8-ubuntu-18`, `openjdk-8-ubuntu-1804`              | *[( openjdk-8/ubuntu/18.04/Dockerfile )](./openjdk-8/ubuntu/18.04/Dockerfile)*   |
 | 8 ( 8u201 ) + Ubuntu 18.04              | `8`, `8-ubuntu`, `8-ubuntu-18`, `8-ubuntu-1804`,                                             | *[( 8/ubuntu/18.04/Dockerfile )](./8/ubuntu/18.04/Dockerfile)*                   |
 | 8 ( 8u201 ) + Ubuntu 16.04              | `8-ubuntu-1604`, `8-ubuntu-16`                                                               | *[( 8/ubuntu/16.04/Dockerfile )](./8/ubuntu/16.04/Dockerfile)*                   |
 
diff --git a/openjdk-11/ubuntu/18.04/Dockerfile b/openjdk-11/ubuntu/18.04/Dockerfile
index d9c9415..50656de 100644
--- a/openjdk-11/ubuntu/18.04/Dockerfile
+++ b/openjdk-11/ubuntu/18.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:18.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 11 SDK
-RUN apt-get update && apt-get -y install openjdk-11-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 11
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+# Install OpenJDK Java 11 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
\ No newline at end of file
diff --git a/openjdk-11/ubuntu/18.04/java-x64.jinfo b/openjdk-11/ubuntu/18.04/java-x64.jinfo
deleted file mode 100644
index a7eed64..0000000
--- a/openjdk-11/ubuntu/18.04/java-x64.jinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-name=java-11-openjdk-x64
-alias=java-11.0.2-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-11-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-11-openjdk-x64/bin/keytool
-hl pack200 /usr/lib/jvm/java-11-openjdk-x64/bin/pack200
-hl rmid /usr/lib/jvm/java-11-openjdk-x64/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-11-openjdk-x64/bin/rmiregistry
-hl unpack200 /usr/lib/jvm/java-11-openjdk-x64/bin/unpack200
-hl jexec /usr/lib/jvm/java-11-openjdk-x64/lib/jexec
-jdk jaotc /usr/lib/jvm/java-11-openjdk-x64/bin/jaotc
-jdk jar /usr/lib/jvm/java-11-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-11-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-11-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-11-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-11-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-11-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-11-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-11-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-11-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-11-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-11-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-11-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-11-openjdk-x64/bin/jinfo
-jdk jjs /usr/lib/jvm/java-11-openjdk-x64/bin/jjs
-jdk jlink /usr/lib/jvm/java-11-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-11-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-11-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-11-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-11-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-11-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-11-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-11-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-11-openjdk-x64/bin/jstatd
-jdk rmic /usr/lib/jvm/java-11-openjdk-x64/bin/rmic
-jdk serialver /usr/lib/jvm/java-11-openjdk-x64/bin/serialver
diff --git a/openjdk-11/ubuntu/20.04/Dockerfile b/openjdk-11/ubuntu/20.04/Dockerfile
index ea5faff..5485682 100644
--- a/openjdk-11/ubuntu/20.04/Dockerfile
+++ b/openjdk-11/ubuntu/20.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:20.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 11 SDK
-RUN apt-get update && apt-get -y install openjdk-11-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 11
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+# Install OpenJDK Java 11 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
\ No newline at end of file
diff --git a/openjdk-11/ubuntu/20.04/java-x64.jinfo b/openjdk-11/ubuntu/20.04/java-x64.jinfo
deleted file mode 100644
index 2a49067..0000000
--- a/openjdk-11/ubuntu/20.04/java-x64.jinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-name=java-11-openjdk-x64
-alias=java-11.0.11-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-11-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-11-openjdk-x64/bin/keytool
-hl pack200 /usr/lib/jvm/java-11-openjdk-x64/bin/pack200
-hl rmid /usr/lib/jvm/java-11-openjdk-x64/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-11-openjdk-x64/bin/rmiregistry
-hl unpack200 /usr/lib/jvm/java-11-openjdk-x64/bin/unpack200
-hl jexec /usr/lib/jvm/java-11-openjdk-x64/lib/jexec
-jdk jaotc /usr/lib/jvm/java-11-openjdk-x64/bin/jaotc
-jdk jar /usr/lib/jvm/java-11-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-11-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-11-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-11-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-11-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-11-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-11-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-11-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-11-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-11-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-11-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-11-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-11-openjdk-x64/bin/jinfo
-jdk jjs /usr/lib/jvm/java-11-openjdk-x64/bin/jjs
-jdk jlink /usr/lib/jvm/java-11-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-11-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-11-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-11-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-11-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-11-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-11-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-11-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-11-openjdk-x64/bin/jstatd
-jdk rmic /usr/lib/jvm/java-11-openjdk-x64/bin/rmic
-jdk serialver /usr/lib/jvm/java-11-openjdk-x64/bin/serialver
diff --git a/openjdk-11/ubuntu/22.04/Dockerfile b/openjdk-11/ubuntu/22.04/Dockerfile
index 2e73eec..7999286 100644
--- a/openjdk-11/ubuntu/22.04/Dockerfile
+++ b/openjdk-11/ubuntu/22.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:22.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 11 SDK
-RUN apt-get update && apt-get -y install openjdk-11-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 11
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+# Install OpenJDK Java 11 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
\ No newline at end of file
diff --git a/openjdk-11/ubuntu/22.04/java-x64.jinfo b/openjdk-11/ubuntu/22.04/java-x64.jinfo
deleted file mode 100644
index 9b9c51f..0000000
--- a/openjdk-11/ubuntu/22.04/java-x64.jinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-name=java-11-openjdk-x64
-alias=java-11.0.16-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-11-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-11-openjdk-x64/bin/keytool
-hl pack200 /usr/lib/jvm/java-11-openjdk-x64/bin/pack200
-hl rmid /usr/lib/jvm/java-11-openjdk-x64/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-11-openjdk-x64/bin/rmiregistry
-hl unpack200 /usr/lib/jvm/java-11-openjdk-x64/bin/unpack200
-hl jexec /usr/lib/jvm/java-11-openjdk-x64/lib/jexec
-jdk jaotc /usr/lib/jvm/java-11-openjdk-x64/bin/jaotc
-jdk jar /usr/lib/jvm/java-11-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-11-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-11-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-11-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-11-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-11-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-11-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-11-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-11-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-11-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-11-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-11-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-11-openjdk-x64/bin/jinfo
-jdk jjs /usr/lib/jvm/java-11-openjdk-x64/bin/jjs
-jdk jlink /usr/lib/jvm/java-11-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-11-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-11-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-11-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-11-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-11-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-11-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-11-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-11-openjdk-x64/bin/jstatd
-jdk rmic /usr/lib/jvm/java-11-openjdk-x64/bin/rmic
-jdk serialver /usr/lib/jvm/java-11-openjdk-x64/bin/serialver
diff --git a/openjdk-14/ubuntu/20.04/Dockerfile b/openjdk-14/ubuntu/20.04/Dockerfile
deleted file mode 100644
index 3638fdf..0000000
--- a/openjdk-14/ubuntu/20.04/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Dockerizing a base images with:
-#
-#   - Ubuntu 20.04 LTS (Focal Fossa)
-#   - OpenJDK 14
-#
-# Build:    docker build -t exoplatform/jdk:openjdk-14 .
-#
-# Run:      docker run -ti exoplatform/jdk:openjdk-14 -version
-
-FROM  exoplatform/ubuntu:20.04
-LABEL maintainer="eXo Platform <docker@exoplatform.com>"
-
-ENV JDK_VERSION 14.0.2
-ENV JDK_MAJOR_VERSION 14
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
-
-# Install OpenJDK Java 14 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
-
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-14/ubuntu/20.04/java-x64.jinfo b/openjdk-14/ubuntu/20.04/java-x64.jinfo
deleted file mode 100644
index 05c0bca..0000000
--- a/openjdk-14/ubuntu/20.04/java-x64.jinfo
+++ /dev/null
@@ -1,36 +0,0 @@
-name=java-14-openjdk-x64
-alias=java-14.0.2-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-14-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-14-openjdk-x64/bin/keytool
-hl rmid /usr/lib/jvm/java-14-openjdk-x64/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-14-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-14-openjdk-x64/lib/jexec
-jdk jaotc /usr/lib/jvm/java-14-openjdk-x64/bin/jaotc
-jdk jar /usr/lib/jvm/java-14-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-14-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-14-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-14-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-14-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-14-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-14-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-14-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-14-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-14-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-14-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-14-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-14-openjdk-x64/bin/jinfo
-jdk jjs /usr/lib/jvm/java-14-openjdk-x64/bin/jjs
-jdk jlink /usr/lib/jvm/java-14-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-14-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-14-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-14-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-14-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-14-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-14-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-14-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-14-openjdk-x64/bin/jstatd
-jdk rmic /usr/lib/jvm/java-14-openjdk-x64/bin/rmic
-jdk serialver /usr/lib/jvm/java-14-openjdk-x64/bin/serialver
diff --git a/openjdk-14/ubuntu/22.04/Dockerfile b/openjdk-14/ubuntu/22.04/Dockerfile
deleted file mode 100644
index 88a409f..0000000
--- a/openjdk-14/ubuntu/22.04/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Dockerizing a base images with:
-#
-#   - Ubuntu 22.04 LTS (Jammy Jellyfish)
-#   - OpenJDK 14
-#
-# Build:    docker build -t exoplatform/jdk:openjdk-14 .
-#
-# Run:      docker run -ti exoplatform/jdk:openjdk-14 -version
-
-FROM  exoplatform/ubuntu:22.04
-LABEL maintainer="eXo Platform <docker@exoplatform.com>"
-
-ENV JDK_VERSION 14.0.2
-ENV JDK_MAJOR_VERSION 14
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
-
-# Install OpenJDK Java 14 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
-
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-14/ubuntu/22.04/java-x64.jinfo b/openjdk-14/ubuntu/22.04/java-x64.jinfo
deleted file mode 100644
index 05c0bca..0000000
--- a/openjdk-14/ubuntu/22.04/java-x64.jinfo
+++ /dev/null
@@ -1,36 +0,0 @@
-name=java-14-openjdk-x64
-alias=java-14.0.2-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-14-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-14-openjdk-x64/bin/keytool
-hl rmid /usr/lib/jvm/java-14-openjdk-x64/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-14-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-14-openjdk-x64/lib/jexec
-jdk jaotc /usr/lib/jvm/java-14-openjdk-x64/bin/jaotc
-jdk jar /usr/lib/jvm/java-14-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-14-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-14-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-14-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-14-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-14-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-14-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-14-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-14-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-14-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-14-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-14-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-14-openjdk-x64/bin/jinfo
-jdk jjs /usr/lib/jvm/java-14-openjdk-x64/bin/jjs
-jdk jlink /usr/lib/jvm/java-14-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-14-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-14-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-14-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-14-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-14-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-14-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-14-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-14-openjdk-x64/bin/jstatd
-jdk rmic /usr/lib/jvm/java-14-openjdk-x64/bin/rmic
-jdk serialver /usr/lib/jvm/java-14-openjdk-x64/bin/serialver
diff --git a/openjdk-17/ubuntu/20.04/Dockerfile b/openjdk-17/ubuntu/20.04/Dockerfile
index 86fcc7d..4c5a058 100644
--- a/openjdk-17/ubuntu/20.04/Dockerfile
+++ b/openjdk-17/ubuntu/20.04/Dockerfile
@@ -10,27 +10,17 @@
 FROM  exoplatform/ubuntu:20.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-ENV JDK_VERSION 17.0.10
 ENV JDK_MAJOR_VERSION 17
-ENV TEMURIN_SUFFIX 7
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
 
 # Install OpenJDK Java 17 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}+${TEMURIN_SUFFIX}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-17/ubuntu/20.04/java-x64.jinfo b/openjdk-17/ubuntu/20.04/java-x64.jinfo
deleted file mode 100644
index c6bfb47..0000000
--- a/openjdk-17/ubuntu/20.04/java-x64.jinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-name=java-17-openjdk-x64
-alias=java-17.0.10-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-17-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-17-openjdk-x64/bin/keytool
-hl rmiregistry /usr/lib/jvm/java-17-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-17-openjdk-x64/lib/jexec
-jdk jar /usr/lib/jvm/java-17-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-17-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-17-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-17-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-17-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-17-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-17-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-17-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-17-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-17-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-17-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-17-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-17-openjdk-x64/bin/jinfo
-jdk jlink /usr/lib/jvm/java-17-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-17-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-17-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-17-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-17-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-17-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-17-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-17-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-17-openjdk-x64/bin/jstatd
-jdk serialver /usr/lib/jvm/java-17-openjdk-x64/bin/serialver
diff --git a/openjdk-17/ubuntu/22.04/Dockerfile b/openjdk-17/ubuntu/22.04/Dockerfile
index ae67d30..ac3f862 100644
--- a/openjdk-17/ubuntu/22.04/Dockerfile
+++ b/openjdk-17/ubuntu/22.04/Dockerfile
@@ -10,27 +10,17 @@
 FROM  exoplatform/ubuntu:22.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-ENV JDK_VERSION 17.0.10
 ENV JDK_MAJOR_VERSION 17
-ENV TEMURIN_SUFFIX 7
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
 
 # Install OpenJDK Java 17 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}+${TEMURIN_SUFFIX}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-17/ubuntu/22.04/java-x64.jinfo b/openjdk-17/ubuntu/22.04/java-x64.jinfo
deleted file mode 100644
index c6bfb47..0000000
--- a/openjdk-17/ubuntu/22.04/java-x64.jinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-name=java-17-openjdk-x64
-alias=java-17.0.10-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-17-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-17-openjdk-x64/bin/keytool
-hl rmiregistry /usr/lib/jvm/java-17-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-17-openjdk-x64/lib/jexec
-jdk jar /usr/lib/jvm/java-17-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-17-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-17-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-17-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-17-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-17-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-17-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-17-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-17-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-17-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-17-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-17-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-17-openjdk-x64/bin/jinfo
-jdk jlink /usr/lib/jvm/java-17-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-17-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-17-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-17-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-17-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-17-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-17-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-17-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-17-openjdk-x64/bin/jstatd
-jdk serialver /usr/lib/jvm/java-17-openjdk-x64/bin/serialver
diff --git a/openjdk-17/ubuntu/24.04/Dockerfile b/openjdk-17/ubuntu/24.04/Dockerfile
index f33ce65..6318038 100644
--- a/openjdk-17/ubuntu/24.04/Dockerfile
+++ b/openjdk-17/ubuntu/24.04/Dockerfile
@@ -10,27 +10,17 @@
 FROM  exoplatform/ubuntu:24.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-ENV JDK_VERSION 17.0.10
 ENV JDK_MAJOR_VERSION 17
-ENV TEMURIN_SUFFIX 7
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
 
 # Install OpenJDK Java 17 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}+${TEMURIN_SUFFIX}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-17/ubuntu/24.04/java-x64.jinfo b/openjdk-17/ubuntu/24.04/java-x64.jinfo
deleted file mode 100644
index c6bfb47..0000000
--- a/openjdk-17/ubuntu/24.04/java-x64.jinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-name=java-17-openjdk-x64
-alias=java-17.0.10-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-17-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-17-openjdk-x64/bin/keytool
-hl rmiregistry /usr/lib/jvm/java-17-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-17-openjdk-x64/lib/jexec
-jdk jar /usr/lib/jvm/java-17-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-17-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-17-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-17-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-17-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-17-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-17-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-17-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-17-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-17-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-17-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-17-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-17-openjdk-x64/bin/jinfo
-jdk jlink /usr/lib/jvm/java-17-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-17-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-17-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-17-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-17-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-17-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-17-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-17-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-17-openjdk-x64/bin/jstatd
-jdk serialver /usr/lib/jvm/java-17-openjdk-x64/bin/serialver
diff --git a/openjdk-21/ubuntu/22.04/Dockerfile b/openjdk-21/ubuntu/22.04/Dockerfile
index d2e2cf9..9aa5814 100644
--- a/openjdk-21/ubuntu/22.04/Dockerfile
+++ b/openjdk-21/ubuntu/22.04/Dockerfile
@@ -10,27 +10,17 @@
 FROM  exoplatform/ubuntu:22.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-ENV JDK_VERSION 21.0.2
 ENV JDK_MAJOR_VERSION 21
-ENV TEMURIN_SUFFIX 13
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
 
 # Install OpenJDK Java 21 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}+${TEMURIN_SUFFIX}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
-
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
\ No newline at end of file
diff --git a/openjdk-21/ubuntu/22.04/java-x64.jinfo b/openjdk-21/ubuntu/22.04/java-x64.jinfo
deleted file mode 100644
index 90233d7..0000000
--- a/openjdk-21/ubuntu/22.04/java-x64.jinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-name=java-21-openjdk-x64
-alias=java-21-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-21-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-21-openjdk-x64/bin/keytool
-hl rmiregistry /usr/lib/jvm/java-21-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-21-openjdk-x64/lib/jexec
-jdk jar /usr/lib/jvm/java-21-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-21-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-21-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-21-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-21-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-21-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-21-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-21-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-21-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-21-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-21-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-21-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-21-openjdk-x64/bin/jinfo
-jdk jlink /usr/lib/jvm/java-21-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-21-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-21-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-21-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-21-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-21-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-21-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-21-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-21-openjdk-x64/bin/jstatd
-jdk serialver /usr/lib/jvm/java-21-openjdk-x64/bin/serialver
diff --git a/openjdk-21/ubuntu/24.04/Dockerfile b/openjdk-21/ubuntu/24.04/Dockerfile
index 70974b7..58b7162 100644
--- a/openjdk-21/ubuntu/24.04/Dockerfile
+++ b/openjdk-21/ubuntu/24.04/Dockerfile
@@ -10,27 +10,17 @@
 FROM  exoplatform/ubuntu:24.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-ENV JDK_VERSION 21.0.2
 ENV JDK_MAJOR_VERSION 21
-ENV TEMURIN_SUFFIX 13
-
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION}/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-
 
 # Install OpenJDK Java 21 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/openjdk-${JDK_VERSION}-linux-x64.tar.gz" \
-  && mv "${JVM_DIR}/jdk-${JDK_VERSION}+${TEMURIN_SUFFIX}" "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION}-openjdk-x64" "${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_MAJOR_VERSION}-openjdk-x64
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-21/ubuntu/24.04/java-x64.jinfo b/openjdk-21/ubuntu/24.04/java-x64.jinfo
deleted file mode 100644
index 90233d7..0000000
--- a/openjdk-21/ubuntu/24.04/java-x64.jinfo
+++ /dev/null
@@ -1,32 +0,0 @@
-name=java-21-openjdk-x64
-alias=java-21-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-21-openjdk-x64/bin/java
-hl keytool /usr/lib/jvm/java-21-openjdk-x64/bin/keytool
-hl rmiregistry /usr/lib/jvm/java-21-openjdk-x64/bin/rmiregistry
-hl jexec /usr/lib/jvm/java-21-openjdk-x64/lib/jexec
-jdk jar /usr/lib/jvm/java-21-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-21-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-21-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-21-openjdk-x64/bin/javadoc
-jdk javap /usr/lib/jvm/java-21-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-21-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-21-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-21-openjdk-x64/bin/jdb
-jdk jdeprscan /usr/lib/jvm/java-21-openjdk-x64/bin/jdeprscan
-jdk jdeps /usr/lib/jvm/java-21-openjdk-x64/bin/jdeps
-jdk jhsdb /usr/lib/jvm/java-21-openjdk-x64/bin/jhsdb
-jdk jimage /usr/lib/jvm/java-21-openjdk-x64/bin/jimage
-jdk jinfo /usr/lib/jvm/java-21-openjdk-x64/bin/jinfo
-jdk jlink /usr/lib/jvm/java-21-openjdk-x64/bin/jlink
-jdk jmap /usr/lib/jvm/java-21-openjdk-x64/bin/jmap
-jdk jmod /usr/lib/jvm/java-21-openjdk-x64/bin/jmod
-jdk jps /usr/lib/jvm/java-21-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-21-openjdk-x64/bin/jrunscript
-jdk jshell /usr/lib/jvm/java-21-openjdk-x64/bin/jshell
-jdk jstack /usr/lib/jvm/java-21-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-21-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-21-openjdk-x64/bin/jstatd
-jdk serialver /usr/lib/jvm/java-21-openjdk-x64/bin/serialver
diff --git a/openjdk-8/ubuntu/18.04/Dockerfile b/openjdk-8/ubuntu/18.04/Dockerfile
index 9742ec0..c2c73d9 100644
--- a/openjdk-8/ubuntu/18.04/Dockerfile
+++ b/openjdk-8/ubuntu/18.04/Dockerfile
@@ -10,29 +10,17 @@
 FROM  exoplatform/ubuntu:18.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-ENV JDK_VERSION_MAJOR 8
-ENV JDK_VERSION_UPDATE 222b10
-ENV JDK_VERSION_UPDATE_SEPARED 222-b10
+ENV JDK_MAJOR_VERSION 8
 
-ENV JDK_VERSION ${JDK_VERSION_MAJOR}u${JDK_VERSION_UPDATE}
-ENV JDK_VERSION_DOT ${JDK_VERSION_MAJOR}.0
-ENV JDK_VERSION_DOT_UPDATE ${JDK_VERSION_DOT}_${JDK_VERSION_UPDATE}
-ENV JDK_DOWNLOAD http://storage.exoplatform.org/public/java/jdk/openjdk/${JDK_VERSION_MAJOR}u${JDK_VERSION_UPDATE}/jdk-${JDK_VERSION_MAJOR}u${JDK_VERSION_UPDATE}-linux-x64.tar.gz
-
-# Install Oracle Java 8 SDK
-ENV JVM_DIR /usr/lib/jvm
-RUN mkdir -p "${JVM_DIR}"
-
-RUN wget -q --no-cookies --no-check-certificate \
-  -O "${DOWNLOAD_DIR}/OpenJDK${JDK_VERSION_MAJOR}U-jdk_x64_linux_${JDK_VERSION}.tar.gz" "${JDK_DOWNLOAD}" \
-  && cd "${JVM_DIR}" \
-  && tar --no-same-owner -xzf "${DOWNLOAD_DIR}/OpenJDK${JDK_VERSION_MAJOR}U-jdk_x64_linux_${JDK_VERSION}.tar.gz" \
-  && rm -f "${DOWNLOAD_DIR}/OpenJDK${JDK_VERSION_MAJOR}U-jdk_x64_linux_${JDK_VERSION}.tar.gz" \
-  && mv "${JVM_DIR}/openjdk-${JDK_VERSION_MAJOR}u${JDK_VERSION_UPDATE_SEPARED}" "${JVM_DIR}/java-${JDK_VERSION_DOT_UPDATE}-openjdk-x64" \
-  && ln -s "${JVM_DIR}/java-${JDK_VERSION_DOT_UPDATE}-openjdk-x64" "${JVM_DIR}/java-${JDK_VERSION_DOT}-openjdk-x64"
-
-ADD java-x64.jinfo ${JVM_DIR}/.java-x64.jinfo
-RUN cat "${JVM_DIR}/.java-x64.jinfo" | grep -E '^(jre|jdk|hl)' | awk '{print "/usr/bin/" $2 " " $2 " " $3 " 30 \n"}' | xargs -t -n4 gosu root update-alternatives --install
-ENV JAVA_HOME ${JVM_DIR}/java-${JDK_VERSION_DOT}-openjdk-x64
+# Install OpenJDK Java 8 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-8/ubuntu/18.04/java-x64.jinfo b/openjdk-8/ubuntu/18.04/java-x64.jinfo
deleted file mode 100644
index a22c863..0000000
--- a/openjdk-8/ubuntu/18.04/java-x64.jinfo
+++ /dev/null
@@ -1,44 +0,0 @@
-name=java-8.0-openjdk-x64
-alias=java-1.8.0_222b10-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/java
-hl keytool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/keytool
-hl pack200 /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/pack200
-hl rmid /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/rmiregistry
-hl unpack200 /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/unpack200
-hl orbd /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/orbd
-hl servertool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/servertool
-hl tnameserv /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/tnameserv
-hl jexec /usr/lib/jvm/java-8.0-openjdk-x64/jre/lib/jexec
-jre policytool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/policytool
-jdk appletviewer /usr/lib/jvm/java-8.0-openjdk-x64/bin/appletviewer
-jdk extcheck /usr/lib/jvm/java-8.0-openjdk-x64/bin/extcheck
-jdk idlj /usr/lib/jvm/java-8.0-openjdk-x64/bin/idlj
-jdk jar /usr/lib/jvm/java-8.0-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-8.0-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-8.0-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-8.0-openjdk-x64/bin/javadoc
-jdk javah /usr/lib/jvm/java-8.0-openjdk-x64/bin/javah
-jdk javap /usr/lib/jvm/java-8.0-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-8.0-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-8.0-openjdk-x64/bin/jdb
-jdk jhat /usr/lib/jvm/java-8.0-openjdk-x64/bin/jhat
-jdk jinfo /usr/lib/jvm/java-8.0-openjdk-x64/bin/jinfo
-jdk jmap /usr/lib/jvm/java-8.0-openjdk-x64/bin/jmap
-jdk jps /usr/lib/jvm/java-8.0-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-8.0-openjdk-x64/bin/jrunscript
-jdk jsadebugd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jsadebugd
-jdk jstack /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstatd
-jdk native2ascii /usr/lib/jvm/java-8.0-openjdk-x64/bin/native2ascii
-jdk rmic /usr/lib/jvm/java-8.0-openjdk-x64/bin/rmic
-jdk schemagen /usr/lib/jvm/java-8.0-openjdk-x64/bin/schemagen
-jdk serialver /usr/lib/jvm/java-8.0-openjdk-x64/bin/serialver
-jdk wsgen /usr/lib/jvm/java-8.0-openjdk-x64/bin/wsgen
-jdk wsimport /usr/lib/jvm/java-8.0-openjdk-x64/bin/wsimport
-jdk xjc /usr/lib/jvm/java-8.0-openjdk-x64/bin/xjc
diff --git a/openjdk-8/ubuntu/20.04/Dockerfile b/openjdk-8/ubuntu/20.04/Dockerfile
index 9570014..448d2be 100644
--- a/openjdk-8/ubuntu/20.04/Dockerfile
+++ b/openjdk-8/ubuntu/20.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:20.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 8 SDK
-RUN apt-get update && apt-get -y install openjdk-8-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 8
+
+# Install OpenJDK Java 8 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-8/ubuntu/20.04/java-x64.jinfo b/openjdk-8/ubuntu/20.04/java-x64.jinfo
deleted file mode 100644
index 54f6153..0000000
--- a/openjdk-8/ubuntu/20.04/java-x64.jinfo
+++ /dev/null
@@ -1,44 +0,0 @@
-name=java-8.0-openjdk-x64
-alias=java-1.8.0_342b07-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/java
-hl keytool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/keytool
-hl pack200 /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/pack200
-hl rmid /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/rmiregistry
-hl unpack200 /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/unpack200
-hl orbd /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/orbd
-hl servertool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/servertool
-hl tnameserv /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/tnameserv
-hl jexec /usr/lib/jvm/java-8.0-openjdk-x64/jre/lib/jexec
-jre policytool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/policytool
-jdk appletviewer /usr/lib/jvm/java-8.0-openjdk-x64/bin/appletviewer
-jdk extcheck /usr/lib/jvm/java-8.0-openjdk-x64/bin/extcheck
-jdk idlj /usr/lib/jvm/java-8.0-openjdk-x64/bin/idlj
-jdk jar /usr/lib/jvm/java-8.0-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-8.0-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-8.0-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-8.0-openjdk-x64/bin/javadoc
-jdk javah /usr/lib/jvm/java-8.0-openjdk-x64/bin/javah
-jdk javap /usr/lib/jvm/java-8.0-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-8.0-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-8.0-openjdk-x64/bin/jdb
-jdk jhat /usr/lib/jvm/java-8.0-openjdk-x64/bin/jhat
-jdk jinfo /usr/lib/jvm/java-8.0-openjdk-x64/bin/jinfo
-jdk jmap /usr/lib/jvm/java-8.0-openjdk-x64/bin/jmap
-jdk jps /usr/lib/jvm/java-8.0-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-8.0-openjdk-x64/bin/jrunscript
-jdk jsadebugd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jsadebugd
-jdk jstack /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstatd
-jdk native2ascii /usr/lib/jvm/java-8.0-openjdk-x64/bin/native2ascii
-jdk rmic /usr/lib/jvm/java-8.0-openjdk-x64/bin/rmic
-jdk schemagen /usr/lib/jvm/java-8.0-openjdk-x64/bin/schemagen
-jdk serialver /usr/lib/jvm/java-8.0-openjdk-x64/bin/serialver
-jdk wsgen /usr/lib/jvm/java-8.0-openjdk-x64/bin/wsgen
-jdk wsimport /usr/lib/jvm/java-8.0-openjdk-x64/bin/wsimport
-jdk xjc /usr/lib/jvm/java-8.0-openjdk-x64/bin/xjc
diff --git a/openjdk-8/ubuntu/22.04/Dockerfile b/openjdk-8/ubuntu/22.04/Dockerfile
index 2673a67..467a797 100644
--- a/openjdk-8/ubuntu/22.04/Dockerfile
+++ b/openjdk-8/ubuntu/22.04/Dockerfile
@@ -10,7 +10,17 @@
 FROM  exoplatform/ubuntu:22.04
 LABEL maintainer="eXo Platform <docker@exoplatform.com>"
 
-# Install OpenJdk Java 8 SDK
-RUN apt-get update && apt-get -y install openjdk-8-jdk-headless && rm -rf /var/lib/apt
+ENV JDK_MAJOR_VERSION 8
+
+# Install OpenJDK Java 8 SDK
+RUN apt-get -qq update && \
+    apt-get -qq -y install gnupg ca-certificates curl
+RUN curl -s https://repos.azul.com/azul-repo.key | gpg --dearmor -o /usr/share/keyrings/azul.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | tee /etc/apt/sources.list.d/zulu.list
+RUN apt-get -qq update && \
+    apt-get -qq -y install zulu${JDK_MAJOR_VERSION}-jdk
+RUN apt-get -qq -y autoremove && \
+    apt-get -qq -y clean && \
+    rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/local/bin/tini", "--", "/usr/bin/java"]
diff --git a/openjdk-8/ubuntu/22.04/java-x64.jinfo b/openjdk-8/ubuntu/22.04/java-x64.jinfo
deleted file mode 100644
index 54f6153..0000000
--- a/openjdk-8/ubuntu/22.04/java-x64.jinfo
+++ /dev/null
@@ -1,44 +0,0 @@
-name=java-8.0-openjdk-x64
-alias=java-1.8.0_342b07-openjdk-x64
-priority=30
-section=main
-
-hl java /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/java
-hl keytool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/keytool
-hl pack200 /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/pack200
-hl rmid /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/rmid
-hl rmiregistry /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/rmiregistry
-hl unpack200 /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/unpack200
-hl orbd /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/orbd
-hl servertool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/servertool
-hl tnameserv /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/tnameserv
-hl jexec /usr/lib/jvm/java-8.0-openjdk-x64/jre/lib/jexec
-jre policytool /usr/lib/jvm/java-8.0-openjdk-x64/jre/bin/policytool
-jdk appletviewer /usr/lib/jvm/java-8.0-openjdk-x64/bin/appletviewer
-jdk extcheck /usr/lib/jvm/java-8.0-openjdk-x64/bin/extcheck
-jdk idlj /usr/lib/jvm/java-8.0-openjdk-x64/bin/idlj
-jdk jar /usr/lib/jvm/java-8.0-openjdk-x64/bin/jar
-jdk jarsigner /usr/lib/jvm/java-8.0-openjdk-x64/bin/jarsigner
-jdk javac /usr/lib/jvm/java-8.0-openjdk-x64/bin/javac
-jdk javadoc /usr/lib/jvm/java-8.0-openjdk-x64/bin/javadoc
-jdk javah /usr/lib/jvm/java-8.0-openjdk-x64/bin/javah
-jdk javap /usr/lib/jvm/java-8.0-openjdk-x64/bin/javap
-jdk jcmd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jcmd
-jdk jconsole /usr/lib/jvm/java-8.0-openjdk-x64/bin/jconsole
-jdk jdb /usr/lib/jvm/java-8.0-openjdk-x64/bin/jdb
-jdk jhat /usr/lib/jvm/java-8.0-openjdk-x64/bin/jhat
-jdk jinfo /usr/lib/jvm/java-8.0-openjdk-x64/bin/jinfo
-jdk jmap /usr/lib/jvm/java-8.0-openjdk-x64/bin/jmap
-jdk jps /usr/lib/jvm/java-8.0-openjdk-x64/bin/jps
-jdk jrunscript /usr/lib/jvm/java-8.0-openjdk-x64/bin/jrunscript
-jdk jsadebugd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jsadebugd
-jdk jstack /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstack
-jdk jstat /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstat
-jdk jstatd /usr/lib/jvm/java-8.0-openjdk-x64/bin/jstatd
-jdk native2ascii /usr/lib/jvm/java-8.0-openjdk-x64/bin/native2ascii
-jdk rmic /usr/lib/jvm/java-8.0-openjdk-x64/bin/rmic
-jdk schemagen /usr/lib/jvm/java-8.0-openjdk-x64/bin/schemagen
-jdk serialver /usr/lib/jvm/java-8.0-openjdk-x64/bin/serialver
-jdk wsgen /usr/lib/jvm/java-8.0-openjdk-x64/bin/wsgen
-jdk wsimport /usr/lib/jvm/java-8.0-openjdk-x64/bin/wsimport
-jdk xjc /usr/lib/jvm/java-8.0-openjdk-x64/bin/xjc