diff --git a/Dockerfile b/Dockerfile
index 48c03f5..e3d4b19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,17 @@
 # Defines the tag for OBS and build script builds:
-#!BuildTag: opensuse/go-devel:16
-#!BuildTag: opensuse/go-devel:%%PKG_VERSION%%
-#!BuildTag: opensuse/go-devel:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: opensuse/golang:1.16
+#!BuildTag: opensuse/golang:%%PKG_VERSION%%
+#!BuildTag: opensuse/golang:%%PKG_VERSION%%.%RELEASE%
 
 FROM opensuse/tumbleweed
 
-# labelprefix=org.opensuse.java-devel
-PREFIXEDLABEL org.opencontainers.image.title="GO 16 development container"
-PREFIXEDLABEL org.opencontainers.image.description="Environment for GO 16 development"
+# labelprefix=org.opensuse.golang
+PREFIXEDLABEL org.opencontainers.image.title="Go 1.16 development container"
+PREFIXEDLABEL org.opencontainers.image.description="Environment for Go 1.16 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/go-devel:%%PKG_VERSION%%.%RELEASE%"
+PREFIXEDLABEL org.opensuse.reference="registry.opensuse.org/opensuse/golang:%%PKG_VERSION%%.%RELEASE%"
 
 # Work around https://github.com/openSUSE/obs-build/issues/487
 RUN zypper install -y openSUSE-release-appliance-docker
diff --git a/go1.16-devel-container.changes b/go1.16-devel-container.changes
index 08270b2..133e666 100644
--- a/go1.16-devel-container.changes
+++ b/go1.16-devel-container.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Mar 24 12:17:43 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Renamed tag to align with upstream
+
+-------------------------------------------------------------------
+Tue Mar 23 19:30:35 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Added full path to reference value
+
+-------------------------------------------------------------------
+Tue Mar 23 15:59:40 UTC 2021 - Marco Varlese <marco.varlese@suse.com>
+
+- Fix to version which missed the 1. in front of it
+
 -------------------------------------------------------------------
 Fri Dec 11 14:10:47 UTC 2020 - Marco Varlese <marco.varlese@suse.com>