diff --git a/Dockerfile b/Dockerfile
index 91169a9..789956f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,30 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: bci/openjdk-devel:11
-#!BuildTag: bci/openjdk-devel:latest
-#!BuildTag: bci/openjdk-devel:11-%RELEASE%
+#!BuildTag: opensuse/bci/openjdk-devel:11
+#!BuildTag: opensuse/bci/openjdk-devel:11-%RELEASE%
 FROM bci/openjdk:11
 
-MAINTAINER SUSE LLC (https://www.suse.com/)
+MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=com.suse.bci.openjdk.devel
-LABEL org.opencontainers.image.title="SLE BCI OpenJDK 11 Development Container Image"
+# labelprefix=org.opensuse.bci.openjdk.devel
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 11 Development Container Image"
 LABEL org.opencontainers.image.description="Java 11 Development environment based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="11"
-LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
+LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
-LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:11-%RELEASE%"
+LABEL org.opencontainers.image.vendor="openSUSE Project"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk-devel:11-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL com.suse.supportlevel="techpreview"
-LABEL com.suse.eula="sle-bci"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
-LABEL com.suse.image-type="sle-bci"
-LABEL com.suse.release-stage="beta"
+
+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/*
+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_VERSION="11"
 
-CMD jshell
+CMD ["/usr/bin/jshell"]
diff --git a/openjdk-11-devel-image.changes b/openjdk-11-devel-image.changes
index 473a0f4..f9d6f92 100644
--- a/openjdk-11-devel-image.changes
+++ b/openjdk-11-devel-image.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Fri Jul 15 11:07:22 UTC 2022 - Dan Čermák <dcermak@suse.com>
+
+- Increase compatibility with openSUSE