diff --git a/cesnet-central/playbooks/files/usr/local/bin/k8s-pods-cleaner.sh b/cesnet-central/playbooks/files/usr/local/bin/k8s-pods-cleaner.sh
index 5a0e482ef08f813c095924eafee8f9690742edc1..62859331b79ca7d99bf4319337ae63c5c8e3749f 100755
--- a/cesnet-central/playbooks/files/usr/local/bin/k8s-pods-cleaner.sh
+++ b/cesnet-central/playbooks/files/usr/local/bin/k8s-pods-cleaner.sh
@@ -5,18 +5,17 @@
 #
 # Example:
 #
-# k8s-pods-cleaner.sh hub app=jupyterhub,component=singleuser-server --yes
+# k8s-pods-cleaner.sh hub --yes
 #
 
 if [ -z "$1" ]; then
-	echo "Usage: $0 NAMESPACE [QUERY [--yes]]"
+	echo "Usage: $0 NAMESPACE [--yes]"
 	exit 0
 fi
 
 NS="$1"
-QUERY="$2"
-PERFORM="$3"
-for pod in $(kubectl get pod -n "$NS" -l "$QUERY" --field-selector="status.phase==Failed" -ojsonpath='{.items[*].metadata.name}'); do
+PERFORM="$2"
+for pod in $(kubectl get pod -n "$NS" | awk 'NR>1 && $3=="Terminating" {print $1}'); do
 	if [ -n "$PERFORM" ]; then
 		kubectl get pod -n "$NS" "$pod" -oyaml > "/tmp/$NS-$pod.yaml"
 		kubectl delete pod -n "$NS" "$pod" --force
diff --git a/cesnet-central/playbooks/notebooks.yaml b/cesnet-central/playbooks/notebooks.yaml
index 5da0f74fd74b4ff48fc36ca02951175a0a6f43bd..0c432cd2673ab9fa7d9f8af34dd3f4993f09239f 100644
--- a/cesnet-central/playbooks/notebooks.yaml
+++ b/cesnet-central/playbooks/notebooks.yaml
@@ -133,7 +133,7 @@
         name: "Notebooks {{ name }} cleanup"
         minute: "*"
         hour: "*"
-        job: "KUBECONFIG=$HOME/.kube/config /usr/local/bin/k8s-pods-cleaner.sh '{{ name }}' app=jupyterhub,component=singleuser-server --yes >/dev/null 2>&1"
+        job: "KUBECONFIG=$HOME/.kube/config /usr/local/bin/k8s-pods-cleaner.sh '{{ name }}' --yes >/dev/null 2>&1"
         user: egi
       with_fileglob:
         - "../deployments/*.yaml"