diff --git a/Dockerfile b/Dockerfile
index c7eac7e..ead4018 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: opensuse/bci/golang:1.19
-#!BuildTag: opensuse/bci/golang:1.19-%RELEASE%
 #!BuildTag: opensuse/bci/golang:oldstable
-#!BuildTag: opensuse/bci/golang:oldstable-%RELEASE%
+#!BuildTag: opensuse/bci/golang:oldstable-2.%RELEASE%
+#!BuildTag: opensuse/bci/golang:1.19
+#!BuildTag: opensuse/bci/golang:1.19-2.%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
diff --git a/golang-oldstable-image.changes b/golang-oldstable-image.changes
index eba7c9c..f4cac15 100644
--- a/golang-oldstable-image.changes
+++ b/golang-oldstable-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:20 UTC 2023 - Dirk Müller <dmueller@suse.com>