diff --git a/Dockerfile b/Dockerfile
index 6578738..06d5223 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,10 @@ LABEL com.suse.release-stage="released"
 # endlabelprefix
 
 RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk-devel git-core maven; zypper -n clean; rm -rf /var/log/*
-ENV JAVA_BINDIR="/usr/lib64/jvm/java/bin"
-ENV JAVA_HOME="/usr/lib64/jvm/java"
-ENV JAVA_ROOT="/usr/lib64/jvm/java"
+ENV JAVA_BINDIR="/usr/lib64/jvm/java-11-openjdk-11/bin"
+ENV JAVA_HOME="/usr/lib64/jvm/java-11-openjdk-11"
+ENV JAVA_ROOT="/usr/lib64/jvm/java-11-openjdk-11"
 ENV JAVA_VERSION="11"
 
 CMD ["/usr/bin/jshell"]
+RUN set -euo pipefail; [ -d $JAVA_HOME ]; [ -d $JAVA_BINDIR ]; [ -f "$JAVA_BINDIR/java" ] && [ -x "$JAVA_BINDIR/java" ]
diff --git a/openjdk-11-devel-image.changes b/openjdk-11-devel-image.changes
index f9d6f92..2595190 100644
--- a/openjdk-11-devel-image.changes
+++ b/openjdk-11-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec  7 15:14:20 UTC 2022 - Dan Čermák <dcermak@suse.com>
+
+- Switch latest to java 17 and fix environment variables (bsc#1206128)
+
 -------------------------------------------------------------------
 Fri Jul 15 11:07:22 UTC 2022 - Dan Čermák <dcermak@suse.com>