diff --git a/Dockerfile b/Dockerfile
index ccc6440..fbd3560 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # Defines the tag for OBS and build script builds:
 #!BuildTag: %%TAGPREFIX%%/cdi-uploadproxy:%%PKG_VERSION%%
 #!BuildTag: %%TAGPREFIX%%/cdi-uploadproxy:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/cdi-uploadproxy:%%PKG_VERSION%%-%%PKG_RELEASE%%
 
 # cdi-uploadproxy container image
 # KUBEVIRTFROM defined in prjconf, e.g.
diff --git a/_service b/_service
index b664f37..d7aeb8e 100644
--- a/_service
+++ b/_service
@@ -1,16 +1,13 @@
 <services>
     <service mode="buildtime" name="kiwi_metainfo_helper"/>
-    <service name="replace_using_package_version" mode="buildtime">
-        <param name="file">Dockerfile</param>
-        <param name="regex">%%PKG_VERSION%%</param>
-        <param name="parse-version">patch</param>
-        <param name="package">containerized-data-importer-uploadproxy</param>
-    </service>
+    <service mode="buildtime" name="cdi_containers_meta"/>
     <service mode="buildtime" name="replace_using_env">
         <param name="file">Dockerfile</param>
+        <param name="var">PKG_VERSION</param>
+        <param name="var">PKG_RELEASE</param>
         <param name="var">TAGPREFIX</param>
         <param name="var">LABELPREFIX</param>
-        <param name="eval">source /usr/lib/obs/service/meta/virt-containers-meta</param>
+        <param name="eval">pkg=containerized-data-importer-uploadproxy source /usr/lib/obs/service/cdi_containers_meta</param>
         <param name="verbose">1</param>
     </service>
     <service mode="buildtime" name="docker_label_helper"/>
diff --git a/cdi-uploadproxy-container.changes b/cdi-uploadproxy-container.changes
index 3169e39..0409a1e 100644
--- a/cdi-uploadproxy-container.changes
+++ b/cdi-uploadproxy-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 28 16:33:58 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Tag the image with <version>-<release>
+
 -------------------------------------------------------------------
 Sun Apr 25 09:44:58 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>