diff --git a/Dockerfile b/Dockerfile
index b4e12e4..7e6b6dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Define the tags for OBS and build script builds:
-#!BuildTag: opensuse/tumbleweed/virt-operator:%%PKG_VERSION%%
-#!BuildTag: opensuse/tumbleweed/virt-operator:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/virt-operator:%%PKG_VERSION%%
+#!BuildTag: %%TAGPREFIX%%/virt-operator:%%PKG_VERSION%%.%RELEASE%
 
 # virt-operator container image
 # KUBEVIRTFROM defined in prjconf, e.g.
@@ -8,18 +8,18 @@
 ARG KUBEVIRTFROM
 FROM $KUBEVIRTFROM
 
-# labelprefix=org.opensuse.kubevirt
+# labelprefix=%%LABELPREFIX%%
 PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-operator container"
 PREFIXEDLABEL org.opencontainers.image.description="Virtualization operator 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-operator:%%PKG_VERSION%%.%RELEASE%"
+PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/virt-operator:%%PKG_VERSION%%.%RELEASE%"
 
 RUN zypper update -y && \
     zypper install -y \
            kubevirt-virt-operator \
            shadow && \
-	useradd --system --no-create-home -u 1001 virt-operator
+    useradd --system --no-create-home -u 1001 virt-operator
 USER 1001
 ENTRYPOINT [ "/usr/bin/virt-operator" ]
diff --git a/_service b/_service
index e3e7cce..bb45d7b 100644
--- a/_service
+++ b/_service
@@ -6,5 +6,12 @@
         <param name="parse-version">patch</param>
         <param name="package">kubevirt-virt-operator</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-operator-container.changes b/virt-operator-container.changes
index 4766518..c470d36 100644
--- a/virt-operator-container.changes
+++ b/virt-operator-container.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 17 07:11:30 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:04:54 UTC 2020 - James Fehlig <jfehlig@suse.com>