diff --git a/Dockerfile b/Dockerfile
index db7a06f..99c524c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 # Defines the tag for OBS and build script builds:
-#!BuildTag: opensuse/tumbleweed/virt-cdi-controller:%%PKG_VERSION%%
-#!BuildTag: opensuse/tumbleweed/virt-cdi-controller:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: opensuse/tumbleweed/cdi-controller:%%PKG_VERSION%%
+#!BuildTag: opensuse/tumbleweed/cdi-controller:%%PKG_VERSION%%.%RELEASE%
 
-# virt-cdi-controller container image
+# cdi-controller container image
 FROM opensuse/tumbleweed
 
 # labelprefix=org.opensuse.kubevirt
@@ -11,13 +11,13 @@ PREFIXEDLABEL org.opencontainers.image.description="Controller for the data fetc
 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-cdi-controller:%%PKG_VERSION%%.%RELEASE%"
+PREFIXEDLABEL org.opensuse.reference="opensuse/tumbleweed/cdi-controller:%%PKG_VERSION%%.%RELEASE%"
 
 RUN zypper update -y && \
     zypper install -y \
            containerized-data-importer-controller \
            shadow && \
-	useradd -u 1001 --create-home -s /bin/bash cdi-controller
+    useradd -u 1001 --create-home -s /bin/bash cdi-controller
 WORKDIR /home/cdi-controller
 USER 1001
 ENTRYPOINT [ "/usr/bin/virt-cdi-controller", "-alsologtostderr" ]
diff --git a/cdi-controller-container.changes b/cdi-controller-container.changes
new file mode 100644
index 0000000..dd8ae90
--- /dev/null
+++ b/cdi-controller-container.changes
@@ -0,0 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 12 09:45:15 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Rename virt-cdi-controller to cdi-controller
+
+-------------------------------------------------------------------
+Sun Oct 25 23:03:09 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- Initial container for CDI controller
diff --git a/virt-cdi-controller-container.changes b/virt-cdi-controller-container.changes
deleted file mode 100644
index 92de696..0000000
--- a/virt-cdi-controller-container.changes
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------
-Sun Oct 25 23:03:09 UTC 2020 - James Fehlig <jfehlig@suse.com>
-
-- Initial container for CDI controller