diff --git a/Dockerfile b/Dockerfile
index b0fbeab..546a5e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,15 @@ PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/openjdk:%%P
 # Work around https://github.com/openSUSE/obs-build/issues/487
 ARG RELEASE_PACKAGE=openSUSE-release-appliance-docker
 
-# Development packages
-RUN zypper install -y --no-recommends $RELEASE_PACKAGE java-11-openjdk-devel maven git-core
+ARG LIBDIR=/usr/lib64
+ENV JAVA_BINDIR=$LIBDIR/jvm/java/bin
+ENV JAVA_HOME=$LIBDIR/jvm/java
+ENV JAVA_ROOT=$LIBDIR/jvm/java
+ENV JAVA_VERSION=11
 
-ENTRYPOINT [ "/bin/bash" ]
+# Development packages
+RUN zypper -n install --no-recommends $RELEASE_PACKAGE \
+	java-11-openjdk-devel maven git-core && \
+	zypper clean -a
+
+CMD [ "jshell" ]
diff --git a/java11-devel-container.changes b/java11-devel-container.changes
index 54ca240..3158136 100644
--- a/java11-devel-container.changes
+++ b/java11-devel-container.changes
@@ -1,5 +1,34 @@
 -------------------------------------------------------------------
-Tue Apr 27 08:10:47 UTC 2020 - Marco Varlese <marco.varlese@suse.com>
+Tue Apr 27 08:58:40 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- stop specifying an entrypoint, these aren't services
+- use single layer
+- zypper clean after install
+- provide JAVA_VERSION, JAVA_ROOT and JAVA_HOME env
+
+-------------------------------------------------------------------
+Wed Mar 24 12:21:53 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Renamed tag to follow upstream
+
+-------------------------------------------------------------------
+Tue Mar 23 19:28:04 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Not having "opensuse" as prefix does not conform to specification as per conversation with fvogt
+
+-------------------------------------------------------------------
+Mon Mar 22 13:28:11 UTC 2021 - Frederic Crozat <fcrozat@suse.com>
+
+- Allow to override base container and release package using
+  Docker arguments.
+
+-------------------------------------------------------------------
+Fri Mar 19 14:41:07 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Added ENTRY_POINT
+
+-------------------------------------------------------------------
+Fri Dec 11 14:10:47 UTC 2020 - Marco Varlese <marco.varlese@suse.com>
 
 - First submission for the Java11 development environment