diff --git a/csi-attacher-image.changes b/csi-attacher-image.changes
index a28bd08..db92daf 100644
--- a/csi-attacher-image.changes
+++ b/csi-attacher-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun  1 14:53:33 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Use more specific tag in org.opensuse.reference
+
 -------------------------------------------------------------------
 Wed Sep 16 06:46:11 UTC 2020 - Tim Serong <tserong@suse.com>
 
diff --git a/csi-attacher-image.kiwi b/csi-attacher-image.kiwi
index c9c696d..57fb66a 100644
--- a/csi-attacher-image.kiwi
+++ b/csi-attacher-image.kiwi
@@ -22,10 +22,10 @@
             <label name="org.opencontainers.image.title" value="csi-attacher container"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="SUSE LLC"/>
-            <label name="org.opencontainers.image.url" value="https://registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%"/>
+            <label name="org.opencontainers.image.url" value="https://registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%"/>
             <label name="org.opencontainers.image.version" value="v%PKG_VERSION%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%"/>
           </suse_label_helper:add_prefix>
         </labels>
       </containerconfig>
diff --git a/leap15_2.xml b/leap15_2.xml
index 0cd70a8..db50ea6 100644
--- a/leap15_2.xml
+++ b/leap15_2.xml
@@ -5,9 +5,9 @@
   <name>cephcsi/csi-attacher</name>
   <prefix>org.opensuse.cephcsi</prefix>
   <title>csi-attacher container</title>
-  <url>https://registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%</url>
+  <url>https://registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%</url>
   <referencelabel>org.opensuse.reference</referencelabel>
-  <reference>registry.opensuse.org/cephcsi/csi-attacher:v%PKG_VERSION%</reference>
+  <reference>registry.opensuse.org/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%</reference>
   <packages_boot>
     <package>
       <name>openSUSE-release-ftp</name>
diff --git a/ses7.xml b/ses7.xml
index 4ddb3e7..42b24eb 100644
--- a/ses7.xml
+++ b/ses7.xml
@@ -7,5 +7,5 @@
   <title>SES csi-attacher container</title>
   <url>https://www.suse.com/products/suse-enterprise-storage/</url>
   <referencelabel>com.suse.reference</referencelabel>
-  <reference>registry.suse.com/ses/7/cephcsi/csi-attacher:v%PKG_VERSION%</reference>
+  <reference>registry.suse.com/ses/7/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%</reference>
 </param>
diff --git a/tumbleweed.xml b/tumbleweed.xml
index ffd70d9..578d553 100644
--- a/tumbleweed.xml
+++ b/tumbleweed.xml
@@ -5,9 +5,9 @@
   <name>opensuse/cephcsi/csi-attacher</name>
   <prefix>org.opensuse.cephcsi</prefix>
   <title>csi-attacher container</title>
-  <url>https://registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%</url>
+  <url>https://registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%</url>
   <referencelabel>org.opensuse.reference</referencelabel>
-  <reference>registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%</reference>
+  <reference>registry.opensuse.org/opensuse/cephcsi/csi-attacher:v%PKG_VERSION%-rev1-build%RELEASE%</reference>
   <packages_boot>
     <package>
       <name>openSUSE-release-ftp</name>