diff --git a/Dockerfile b/Dockerfile
index 73f1c33..d023ca9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Define the tags for OBS and build script builds:
-#!BuildTag: opensuse/tumbleweed/virt-handler:%%PKG_VERSION%%
-#!BuildTag: opensuse/tumbleweed/virt-handler:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/virt-handler:%%PKG_VERSION%%
+#!BuildTag: %%TAGPREFIX%%/virt-handler:%%PKG_VERSION%%.%RELEASE%
 
 # virt-handler container image
 # KUBEVIRTFROM defined in prjconf, e.g.
@@ -8,20 +8,20 @@
 ARG KUBEVIRTFROM
 FROM $KUBEVIRTFROM
 
-# labelprefix=org.opensuse.kubevirt
+# labelprefix=%%LABELPREFIX%%
 PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-handler container"
 PREFIXEDLABEL org.opencontainers.image.description="Virtualization handler for kubevirt"
 PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%"
 PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%"
 PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%"
-PREFIXEDLABEL org.opensuse.reference="opensuse/tumbleweed/virt-handler:%%PKG_VERSION%%.%RELEASE%"
+PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/virt-handler:%%PKG_VERSION%%.%RELEASE%"
 
 RUN zypper update -y && \
     zypper install -y \
            iproute2 \
-	   iptables \
+           iptables \
            libvirt-client \
-	   kubevirt-container-disk \
+           kubevirt-container-disk \
            kubevirt-virt-handler
 
 ENTRYPOINT [ "/usr/bin/virt-handler" ]
diff --git a/_service b/_service
index bc7b072..e8b1a9a 100644
--- a/_service
+++ b/_service
@@ -6,5 +6,12 @@
         <param name="parse-version">patch</param>
         <param name="package">kubevirt-virt-handler</param>
     </service>
-    <service mode="buildtime" name="docker_label_helper"/> 
+    <service mode="buildtime" name="replace_using_env">
+        <param name="file">Dockerfile</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="verbose">1</param>
+    </service>
+    <service mode="buildtime" name="docker_label_helper"/>
 </services>
diff --git a/virt-handler-container.changes b/virt-handler-container.changes
index 6a7ac4e..7b0ce62 100644
--- a/virt-handler-container.changes
+++ b/virt-handler-container.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 17 07:05:26 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Add placeholder vars to be replaced during build
+- Fix mixed tabs and spaces
+
 -------------------------------------------------------------------
 Tue Nov 17 23:02:10 UTC 2020 - James Fehlig <jfehlig@suse.com>