diff --git a/_service b/_service
index 71ee43b..9b21815 100644
--- a/_service
+++ b/_service
@@ -14,4 +14,5 @@
     <param name="compression">gz</param>
   </service>
   <service name="set_version" mode="disabled"/>
+  <service name="download_files" mode="disabled"/>
 </services>
diff --git a/disks-images-provider.yaml b/disks-images-provider.yaml
new file mode 100644
index 0000000..5dd6d65
--- /dev/null
+++ b/disks-images-provider.yaml
@@ -0,0 +1,56 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: disks-images-provider
+  namespace: kubevirt
+  labels:
+    kubevirt.io: "disks-images-provider"
+spec:
+  selector:
+    matchLabels:
+      kubevirt.io: "disks-images-provider"
+  template:
+    metadata:
+      labels:
+        name: disks-images-provider
+        kubevirt.io: disks-images-provider
+      name: disks-images-provider
+    spec:
+      serviceAccountName: kubevirt-testing
+      containers:
+        - name: target
+          image: quay.io/kubevirt/disks-images-provider:v0.46.0
+          imagePullPolicy: Always
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/bin/sh","-c","source /etc/bashrc && chroot /host losetup -d ${LOOP_DEVICE} && chroot /host umount ${LOOP_DEVICE_HP} && chroot /host losetup -d ${LOOP_DEVICE_HP}"]
+          volumeMounts:
+          - name: images
+            mountPath: /hostImages
+          - name: local-storage
+            mountPath: /local-storage
+          - name: host-dir
+            mountPath: /host
+            mountPropagation: Bidirectional
+          securityContext:
+            privileged: true
+          readinessProbe:
+            exec:
+              command:
+              - cat
+              - /ready
+            initialDelaySeconds: 10
+            periodSeconds: 5
+      volumes:
+        - name: images
+          hostPath:
+            path: /tmp/hostImages
+            type: DirectoryOrCreate
+        - name: local-storage
+          hostPath:
+            path: /mnt/local-storage
+            type: DirectoryOrCreate
+        - name: host-dir
+          hostPath:
+            path: /
diff --git a/kubevirt.changes b/kubevirt.changes
index cb9398f..dc66747 100644
--- a/kubevirt.changes
+++ b/kubevirt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 19 16:24:09 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Pack only kubevirt-{operator,cr}.yaml into manifests
+- Include manifests/testing/* into tests package
+- Use disks-images-provider.yaml from upstream
+
 -------------------------------------------------------------------
 Mon Oct 11 15:02:22 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 
diff --git a/kubevirt.spec b/kubevirt.spec
index b32196b..97a8f71 100644
--- a/kubevirt.spec
+++ b/kubevirt.spec
@@ -27,6 +27,7 @@ Source0:        %{name}-%{version}.tar.gz
 Source1:        kubevirt-psp-caasp.yaml
 Source2:        kubevirt_containers_meta
 Source3:        kubevirt_containers_meta.service
+Source4:        https://github.com/kubevirt/kubevirt/releases/download/v%{version}/disks-images-provider.yaml
 Source100:      %{name}-rpmlintrc
 BuildRequires:  glibc-devel-static
 BuildRequires:  golang-packaging
@@ -208,16 +209,23 @@ install -p -m 0755 cmd/virt-launcher/node-labeller/node-labeller.sh %{buildroot}
 # virt-launcher SELinux policy needs to land in virt-handler container
 install -p -m 0644 cmd/virt-handler/virt_launcher.cil %{buildroot}/
 
-mkdir -p %{buildroot}%{_datadir}/kube-virt
-cp -r _out/manifests %{buildroot}%{_datadir}/kube-virt/
-# Dont install OLM manifests
-rm -rf %{buildroot}%{_datadir}/kube-virt/manifests/release/olm
+# Install release manifests
+mkdir -p %{buildroot}%{_datadir}/kube-virt/manifests/release
+install -m 0644 _out/manifests/release/kubevirt-operator.yaml %{buildroot}%{_datadir}/kube-virt/manifests/release/
+install -m 0644 _out/manifests/release/kubevirt-cr.yaml %{buildroot}%{_datadir}/kube-virt/manifests/release/
 # TODO:
 # Create a proper Pod Security Policy (PSP) for KubeVirt. For now, add one
 # that uses the CaaSP privileged PSP. It can be used with CaaSP-based
 # Kubernetes clusters.
 install -m 644 %{S:1} %{buildroot}/%{_datadir}/kube-virt/manifests/release/
-install -m 0644 tests/default-config.json %{buildroot}%{_datadir}/kube-virt
+
+# Install manifests for testing
+mkdir -p %{buildroot}%{_datadir}/kube-virt/manifests/testing
+install -m 0644 _out/manifests/testing/* %{buildroot}%{_datadir}/kube-virt/manifests/testing/
+# The generated disks-images-provider.yaml refers to nonexistent container
+# images. Overwrite it with the upstream version for testing.
+install -m 0644 %{S:4} %{buildroot}/%{_datadir}/kube-virt/manifests/testing/
+install -m 0644 tests/default-config.json %{buildroot}%{_datadir}/kube-virt/manifests/testing/
 
 # Install kubevirt_containers_meta build service
 mkdir -p %{buildroot}%{_prefix}/lib/obs/service
@@ -266,14 +274,14 @@ install -m 0644 %{S:3} %{buildroot}%{_prefix}/lib/obs/service
 %license LICENSE
 %doc README.md
 %dir %{_datadir}/kube-virt
-%{_datadir}/kube-virt/manifests
+%{_datadir}/kube-virt/manifests/release
 
 %files tests
 %license LICENSE
 %doc README.md
 %dir %{_datadir}/kube-virt
 %{_bindir}/virt-tests
-%{_datadir}/kube-virt/default-config.json
+%{_datadir}/kube-virt/manifests/testing
 
 %files -n obs-service-kubevirt_containers_meta
 %license LICENSE