diff --git a/Dockerfile b/Dockerfile
index 7973a45..6ebf961 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,17 @@
 # Defines the tag for OBS and build script builds:
-#!BuildTag: opensuse/java-devel:15
-#!BuildTag: opensuse/java-devel:%%PKG_VERSION%%
-#!BuildTag: opensuse/java-devel:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: opensuse/openjdk:15
+#!BuildTag: opensuse/openjdk:%%PKG_VERSION%%
+#!BuildTag: opensuse/openjdk:%%PKG_VERSION%%.%RELEASE%
 
 FROM opensuse/tumbleweed
 
-# labelprefix=org.opensuse.java-devel
+# labelprefix=org.opensuse.openjdk
 PREFIXEDLABEL org.opencontainers.image.title="Java 15 development container"
 PREFIXEDLABEL org.opencontainers.image.description="Environment for Java 15 development"
 PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%"
 PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%"
 PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%"
-PREFIXEDLABEL org.opensuse.reference="opensuse/java-devel:%%PKG_VERSION%%.%RELEASE%"
+PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/openjdk:%%PKG_VERSION%%.%RELEASE%"
 
 # Work around https://github.com/openSUSE/obs-build/issues/487
 RUN zypper install -y openSUSE-release-appliance-docker
diff --git a/java15-devel-container.changes b/java15-devel-container.changes
index 401f899..00e2ca6 100644
--- a/java15-devel-container.changes
+++ b/java15-devel-container.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 24 12:19:36 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Renamed tag to follow upstream
+
+-------------------------------------------------------------------
+Tue Mar 23 19:25:53 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Not having "opensuse" as prefix does not conform to specification as per conversation with fvogt
+
 -------------------------------------------------------------------
 Fri Mar 19 14:40:35 UTC 2021 - Marco Varlese <marco.varlese@suse.com>