diff --git a/.forgejo/patches/linux-template-builder_use-fuse.patch b/.forgejo/patches/linux-template-builder_use-fuse.patch
index 023d2c7..4fa02af 100644
--- a/.forgejo/patches/linux-template-builder_use-fuse.patch
+++ b/.forgejo/patches/linux-template-builder_use-fuse.patch
@@ -1,15 +1,26 @@
 diff --git a/cleanup_image b/cleanup_image
-index 224c04a..7a03b9a 100755
+index 224c04a..911b238 100755
 --- a/cleanup_image
 +++ b/cleanup_image
-@@ -20,5 +20,5 @@ fi
+@@ -1,6 +1,7 @@
+ #!/bin/sh
+ 
+ export INSTALLDIR=$1
++export TEMPLATE_USE_FUSE=1
+ 
+ . ./builder_setup
+ 
+@@ -20,5 +21,8 @@ fi
  echo "--> Cleaning up image file..."
  $SCRIPTSDIR/09_cleanup.sh
  
 -echo "--> Compacting image file..."
 -/sbin/fstrim -v "$INSTALLDIR"
-+# echo "--> Compacting image file..."
-+# /sbin/fstrim -v "$INSTALLDIR"
++# fstrim not supported in userspace
++if [ "$TEMPLATE_USE_FUSE" -ne 1 ]; then
++	echo "--> Compacting image file..."
++	/sbin/fstrim -v "$INSTALLDIR"
++fi
 diff --git a/prepare_image b/prepare_image
 index 6334879..de1a2af 100755
 --- a/prepare_image
diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml
index b5093f7..eba7208 100644
--- a/.forgejo/workflows/test-build.yaml
+++ b/.forgejo/workflows/test-build.yaml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - name: Environment setup
         run: |
-          apk add rpm wget losetup coreutils eudev e2fsprogs xen doas sudo curl nodejs git alpine-sdk fuse2fs patch findutils
+          apk add rpm wget coreutils eudev e2fsprogs xen doas sudo curl nodejs git alpine-sdk fuse2fs patch findutils grep
           cd /etc/apk/keys
           curl -JO https://ayakael.net/api/packages/forge/alpine/key
       - name: Repo pull