diff --git a/.gitea/workflows/dfi.bash b/.gitea/workflows/dfi.bash
index 1ec90b6..4f6e5f3 100755
--- a/.gitea/workflows/dfi.bash
+++ b/.gitea/workflows/dfi.bash
@@ -41,9 +41,9 @@ function host::clean()
     || echo "No docker-finance containers found"
 
   # Remove all images not in use
-  local -r _images=("$(docker images -aq)")
+  local -r _images=("$(docker images -a --format=table | grep docker-finance | gawk '{print $3}' | sort -u)")
   while read _line; do
-    docker image rm "$_line" || continue
+    docker image rm -f "$_line" || continue
   done < <(echo "${_images[@]}")
 
   # Remove all leftovers
@@ -53,7 +53,8 @@ function host::clean()
   # Remove default `dfi` layout
   local _paths
   _paths+=(".bashrc")
-  _paths+=(".config/docker-finance.d")
+  _paths+=(".config")
+  _paths+=(".docker")
   _paths+=("docker-finance")
   _paths+=("finance-flow")
   _paths+=("plugins")