diff --git a/.env.sample b/.env.sample
index d5570095809dc1861980a2d85915dbb4ee8302e8..5e3e1e7ae5e8020f5f5271da63e08e80e072891a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -23,6 +23,8 @@ TZ=Europe/Paris
 ANACONDA=true
 # Install QGIS
 QGIS=true
+# Install JAVA tell which jdk ie default-jdk openjdk-8 etc.
+JAVA=
 # Should the user have sudo rights
 # **only home is a volume, any modifcation in other FS will be lost**
 SUDO=false
diff --git a/docker-compose.yml b/docker-compose.yml
index 96369d5e4562a523222013725abaec772aadc0b9..150ccd31ab38e0a0d9ba910d164e8ded0b0a0a05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,8 @@ services:
       args:
         - QGIS=${QGIS}
         - ANACONDA=${ANACONDA}
-    image: "webtop-ubuntu-mate:anaconda-${ANACONDA}_QGIS-${QGIS}_SUDO-${SUDO}"
-    #image: lscr.io/linuxserver/webtop:ubuntu-mate
+        - JAVA=${JAVA}
+    image: "webtop-ubuntu-mate:anaconda-${ANACONDA}_QGIS-${QGIS}_JAVA-${JAVA}_SUDO-${SUDO}"
     shm_size: '1gb'
     security_opt:
       - seccomp:unconfined #optional
diff --git a/docker/kasm/Dockerfile b/docker/kasm/Dockerfile
index befc64fcecd653c4bc7486cf53a7048c28ba7f41..51cc4868188eccf0a95a79e133acd2d4ec1cb3e3 100644
--- a/docker/kasm/Dockerfile
+++ b/docker/kasm/Dockerfile
@@ -4,6 +4,7 @@ ENV STARTUPDIR /custom-cont-init.d
 
 ARG QGIS
 ARG ANACONDA
+ARG JAVA
 ARG ANACONDA_VERS=Anaconda3-2024.02-1
 
 RUN apt-get update && \
@@ -35,6 +36,11 @@ RUN if [ "$QGIS" = true ] ; then \
     apt-get -y install qgis qgis-plugin-grass; \
     fi
 
+RUN if [ ! -z "$JAVA" ] ; then \
+    apt-get update; \
+    apt-get -y install $JAVA-jdk $JAVA-jre; \
+    fi
+
 COPY custom_startup.sh $STARTUPDIR/custom_startup.sh
 COPY change_password.sh /
 COPY lecture /etc/sudoers.lecture