diff --git a/Dockerfile b/Dockerfile
index aa3f654..3908dea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # Define the tags for OBS and build script builds:
 #!BuildTag: %%TAGPREFIX%%/virt-handler:%%PKG_VERSION%%
 #!BuildTag: %%TAGPREFIX%%/virt-handler:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/virt-handler:%%PKG_VERSION%%-%%PKG_RELEASE%%
 
 # virt-handler container image
 # KUBEVIRTFROM defined in prjconf, e.g.
diff --git a/_service b/_service
index e8b1a9a..336b694 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">kubevirt-virt-handler</param>
-    </service>
+    <service mode="buildtime" name="kubevirt_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=kubevirt-virt-handler source /usr/lib/obs/service/kubevirt_containers_meta</param>
         <param name="verbose">1</param>
     </service>
     <service mode="buildtime" name="docker_label_helper"/>
diff --git a/virt-handler-container.changes b/virt-handler-container.changes
index 0ac4344..9cfe55e 100644
--- a/virt-handler-container.changes
+++ b/virt-handler-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 28 11:46:13 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Tag the image with <version>-<release>
+
 -------------------------------------------------------------------
 Sun Apr 18 07:54:24 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>