diff --git a/Dockerfile b/Dockerfile
index 118bf96..b80cc62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: opensuse/bci/golang:1.20
-#!BuildTag: opensuse/bci/golang:1.20-%RELEASE%
 #!BuildTag: opensuse/bci/golang:stable
-#!BuildTag: opensuse/bci/golang:stable-%RELEASE%
+#!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
+#!BuildTag: opensuse/bci/golang:1.20
+#!BuildTag: opensuse/bci/golang:1.20-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:latest
 
 FROM opensuse/tumbleweed:latest
diff --git a/golang-stable-image.changes b/golang-stable-image.changes
index 12c9875..9c301a7 100644
--- a/golang-stable-image.changes
+++ b/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 22 16:56:53 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- Order the stability buildtag first in the list and prefix them with an stability index to avoid overlaps
+
 -------------------------------------------------------------------
 Tue Jun 13 15:19:02 UTC 2023 - Dirk Müller <dmueller@suse.com>