diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 97cf3c0efe..2c1671cf4c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,18 +9,6 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
-  report:
-    name: Report
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: ref
-      run: echo ${{ github.ref }}
-    - name: event_name
-      run: echo ${{ github.event_name }}
-    - name: disk usage
-      run: df -h
-    - name: memory
-      run: free -m
   build:
     if: github.event.repository.full_name == 'lf-edge/eve'
     runs-on: ${{ matrix.os }}
@@ -138,6 +126,15 @@ jobs:
         run: |
           rm -rf dist dist.xen
           make -e V=1 HV=mini LINUXKIT_PKG_TARGET=push eve
+      - name: Pre clean report
+        if: ${{ always() }}
+        run: |
+          echo Disk usage
+          df -h
+          echo Memory
+          free -m
+          docker system df
+          docker system df -v
       - name: Clean
         if: ${{ always() }}
         run: |
diff --git a/Makefile b/Makefile
index e243d9d6e4..9b4b6a6ae3 100644
--- a/Makefile
+++ b/Makefile
@@ -298,7 +298,7 @@ currentversion:
 
 .PHONY: currentversion linuxkit
 
-test: $(GOBUILDER) | $(DIST)
+test: $(LINUXKIT) test-images-patches | $(DIST)
 	@echo Running tests on $(GOMODULE)
 	$(QUIET)$(DOCKER_GO) "gotestsum --jsonfile $(DOCKER_DIST)/results.json --junitfile $(DOCKER_DIST)/results.xml" $(GOTREE) $(GOMODULE)
 	$(QUIET): $@: Succeeded
@@ -675,6 +675,9 @@ eve-%: pkg/%/Dockerfile build-tools $(RESCAN_DEPS)
 images/rootfs-%.yml.in: images/rootfs.yml.in FORCE
 	$(QUITE)tools/compose-image-yml.sh $< $@ "$(ROOTFS_VERSION)-$*-$(ZARCH)"
 
+images-patches := $(wildcard images/*.patch)
+test-images-patches: $(images-patches:%.patch=%)
+
 $(ROOTFS_FULL_NAME)-adam-kvm-$(ZARCH).$(ROOTFS_FORMAT): $(ROOTFS_FULL_NAME)-kvm-adam-$(ZARCH).$(ROOTFS_FORMAT)
 $(ROOTFS_FULL_NAME)-kvm-adam-$(ZARCH).$(ROOTFS_FORMAT): fullname-rootfs $(SSH_KEY)
 fullname-rootfs: $(ROOTFS_FULL_NAME)-$(HV)-$(ZARCH).$(ROOTFS_FORMAT) current
diff --git a/images/rootfs-acrn.yml.in.patch b/images/rootfs-acrn.yml.in.patch
index c7264300ce..b791da143b 100644
--- a/images/rootfs-acrn.yml.in.patch
+++ b/images/rootfs-acrn.yml.in.patch
@@ -1,18 +1,18 @@
---- images/rootfs.yml.in	2020-04-08 18:14:23.000000000 -0700
-+++ images/rootfs-acrn.yml.in	2020-04-08 18:22:10.000000000 -0700
+--- images/rootfs.yml.in	2022-06-24 10:36:01.021218466 +0300
++++ images/rootfs-acrn.yml.in	2022-06-24 10:50:32.399494792 +0300
 @@ -1,5 +1,5 @@
  kernel:
 -  image: KERNEL_TAG
 +  image: ACRN_KERNEL_TAG
    cmdline: "rootdelay=3"
  init:
-   - linuxkit/init:v0.5
-@@ -9,7 +9,7 @@
-   - linuxkit/memlogd:v0.5
+   - linuxkit/init:a68f9fa0c1d9dbfc9c23663749a0b7ac510cbe1c
+@@ -10,7 +10,7 @@
+   - DOM0ZTOOLS_TAG
    - GRUB_TAG
    - FW_TAG
 -  - XEN_TAG
 +  - ACRN_TAG
    - GPTTOOLS_TAG
-   - DOM0ZTOOLS_TAG
  onboot:
+    - name: rngd
diff --git a/images/rootfs-adam-kvm.yml.in.patch b/images/rootfs-adam-kvm.yml.in.patch
index 721b750d73..308ebf441e 100644
--- a/images/rootfs-adam-kvm.yml.in.patch
+++ b/images/rootfs-adam-kvm.yml.in.patch
@@ -10,6 +10,6 @@
 +        - /var/persist:/persist
 +        - /var/config:/config
 +     command: ["/bin/eve-embedded.sh"]
-    - name: debug
-      image: DEBUG_TAG
-      cgroupsPath: /eve/services/debug
+    - name: edgeview
+      image: EDGEVIEW_TAG
+      cgroupsPath: /eve/services/eve-edgeview
diff --git a/images/rootfs-edgeview-kvm.yml.in.patch b/images/rootfs-edgeview-kvm.yml.in.patch
deleted file mode 100644
index 4279736bc4..0000000000
--- a/images/rootfs-edgeview-kvm.yml.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- images/rootfs.yml.in
-+++ images/rootfs-edgeview-kvm.yml.in
-@@ -30,6 +30,10 @@ services:
-      image: NEWLOGD_TAG
-      cgroupsPath: /eve/services/eve-newlog
-      oomScoreAdj: -999
-+   - name: edgeview
-+     image: EDGEVIEW_TAG
-+     cgroupsPath: /eve/services/edgeview
-+     oomScoreAdj: -800
-    - name: debug
-      image: DEBUG_TAG
-      cgroupsPath: /eve/services/debug
diff --git a/images/rootfs-mini.yml.in.patch b/images/rootfs-mini.yml.in.patch
index 156223b44b..cfbb630cab 100644
--- a/images/rootfs-mini.yml.in.patch
+++ b/images/rootfs-mini.yml.in.patch
@@ -1,6 +1,6 @@
---- images/rootfs.yml.in	2021-05-13 16:54:55.000000000 -0700
-+++ images/rootfs.yml.in	2021-05-20 16:06:39.000000000 -0700
-@@ -1,67 +1,18 @@
+--- images/rootfs.yml.in	2022-06-24 08:41:44.000000000 +0300
++++ images/rootfs-mini.yml.in	2022-06-24 08:45:15.000000000 +0300
+@@ -1,71 +1,18 @@
  kernel:
 -  image: KERNEL_TAG
 +  image: NEW_KERNEL_TAG
@@ -34,6 +34,10 @@
 -     image: NEWLOGD_TAG
 -     cgroupsPath: /eve/services/newlogd
 -     oomScoreAdj: -999
+-   - name: edgeview
+-     image: EDGEVIEW_TAG
+-     cgroupsPath: /eve/services/eve-edgeview
+-     oomScoreAdj: -800
     - name: debug
       image: DEBUG_TAG
       cgroupsPath: /eve/services/debug
diff --git a/tools/compose-image-yml.sh b/tools/compose-image-yml.sh
index f53269ab86..cfd455b3fb 100755
--- a/tools/compose-image-yml.sh
+++ b/tools/compose-image-yml.sh
@@ -32,7 +32,7 @@ main() {
     local eve_version="$3"
 
     if [ -e "${out_templ_path}".patch ]; then
-        patch -p0 -o "${out_templ_path}".sed < "${out_templ_path}".patch
+        patch -p0 -o "${out_templ_path}".sed < "${out_templ_path}".patch || exit 1
     else
         cp "${base_templ_path}" "${out_templ_path}".sed
     fi