diff --git a/playbooks/base-minimal/cleanup.yaml b/playbooks/base-minimal/cleanup.yaml
index 719e6d2..2aea1ce 100644
--- a/playbooks/base-minimal/cleanup.yaml
+++ b/playbooks/base-minimal/cleanup.yaml
@@ -4,13 +4,13 @@
       when: not (zuul_success | bool)
       block:
         - name: get df disk usage
-          raw: df
+          raw: timeout -k 5 90 df
 
         - name: get df inode usage
-          raw: df -i
+          raw: timeout -k 5 90 df -i
 
         - name: get l2 networking
-          raw: ip link
+          raw: timeout -k 5 90 ip link
 
         - name: get l3 networking
-          raw: ip addr
+          raw: timeout -k 5 90 ip addr
diff --git a/playbooks/base/cleanup.yaml b/playbooks/base/cleanup.yaml
index 719e6d2..2aea1ce 100644
--- a/playbooks/base/cleanup.yaml
+++ b/playbooks/base/cleanup.yaml
@@ -4,13 +4,13 @@
       when: not (zuul_success | bool)
       block:
         - name: get df disk usage
-          raw: df
+          raw: timeout -k 5 90 df
 
         - name: get df inode usage
-          raw: df -i
+          raw: timeout -k 5 90 df -i
 
         - name: get l2 networking
-          raw: ip link
+          raw: timeout -k 5 90 ip link
 
         - name: get l3 networking
-          raw: ip addr
+          raw: timeout -k 5 90 ip addr