diff --git a/Dockerfile b/Dockerfile
index 1e9e749..474cbf9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:stable
+#!BuildTag: opensuse/bci/golang:%%golang_version%%-1.%RELEASE%
+#!BuildTag: opensuse/bci/golang:%%golang_version%%
 #!BuildTag: opensuse/bci/golang:1.23-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:1.23
-#!BuildTag: opensuse/bci/golang:%%golang_version%%
 #!BuildTag: opensuse/bci/golang:latest
 
 FROM opensuse/tumbleweed:latest
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.23-1.%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.23-1.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:%%golang_version%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"
diff --git a/golang-stable-image.changes b/golang-stable-image.changes
index 0957bfa..4e2f9c3 100644
--- a/golang-stable-image.changes
+++ b/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>