diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..7d85af4
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,8 @@
+<constraints>
+  <!-- CDI needs larger disk for builds -->
+  <hardware>
+    <disk>
+      <size unit="G">6</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git a/containerized-data-importer.changes b/containerized-data-importer.changes
index 05cf904..cb6bd29 100644
--- a/containerized-data-importer.changes
+++ b/containerized-data-importer.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 29 05:23:06 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Set default reg_path='registry.opensuse.org/kubevirt'
+- Add _constraints file with disk requirements
+- Drop CDI_VERSION env var since its not used during the build
+
 -------------------------------------------------------------------
 Wed Apr 21 15:31:22 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 
diff --git a/containerized-data-importer.spec b/containerized-data-importer.spec
index 02582a4..1018295 100644
--- a/containerized-data-importer.spec
+++ b/containerized-data-importer.spec
@@ -135,7 +135,7 @@ case "${distro}" in
     150300:0)
 	reg_path='registry.suse.de/suse/containers/sle-server/15/containers/suse/sles/15.3' ;;
     *)
-	reg_path='registry.opensuse.org/virtualization/container/kubevirt' ;;
+	reg_path='registry.opensuse.org/kubevirt' ;;
 esac
 %else
 reg_path='%{registry_path}'
@@ -144,7 +144,6 @@ reg_path='%{registry_path}'
 export GOPATH=%{_builddir}/go
 export GOFLAGS="-buildmode=pie -mod=vendor"
 env \
-CDI_VERSION=%{version} \
 CDI_SOURCE_DATE_EPOCH="$(date -r LICENSE +%s)" \
 CDI_GIT_COMMIT='v%{version}' \
 CDI_GIT_VERSION='v%{version}' \