diff --git a/tools/attack/adv-cache-3/queue/97-adv-cache-3-image-w2-resume.sh b/tools/attack/adv-cache-3/queue/97-adv-cache-3-image-w2-resume.sh
index da1accda4..3e26e12f8 100755
--- a/tools/attack/adv-cache-3/queue/97-adv-cache-3-image-w2-resume.sh
+++ b/tools/attack/adv-cache-3/queue/97-adv-cache-3-image-w2-resume.sh
@@ -6,10 +6,8 @@ set -u
 BIN=/srv/builds/_adv-cache-3/bin/adv-cache-3; D=/srv/builds/_adv-cache-3/logs; mkdir -p $D
 T=${THREADS:-48}
 echo $$ > $D/image2-batch.pid
-while /srv/builds/_bin/lease status 2>/dev/null | grep -qiE "v5|class-v5"; do sleep 30; done
-yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | grep -qiE "v5|class-v5"; do sleep 30; done; }
+yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n "/^waiting:/,\$p" | grep -E "owner=class-v5|v5.*owner=attack-pass" | grep -vq "owner=adv-"; do sleep 30; done; }
 run() { tag=$1; shift; yield_v5; echo "$(date -u +%FT%TZ) start $tag" >> $D/ledger.txt; /srv/builds/_bin/lease pool $T --min 16 --label "adv-cache-3 $tag" --owner adv-cache-3 -- $BIN "$@" > $D/$tag.log 2>&1; rc=$?; echo "$(date -u +%FT%TZ) end $tag rc=$rc" >> $D/ledger.txt; echo "$tag rc=$rc"; }
-
 run image-w2-r6-d64-full        image --w 2 --rounds 6 --depth 64 --threads {cores}
 run image-w2-plant-noff         image --w 2 --rounds 6 --depth 6 --plant no-feedforward --threads {cores}
 echo "image2-batch done $(date -u +%FT%TZ)"
diff --git a/tools/attack/adv-cache-3/queue/98-adv-cache-3-flip-ladder.sh b/tools/attack/adv-cache-3/queue/98-adv-cache-3-flip-ladder.sh
index 00458b795..ad3ec6a53 100755
--- a/tools/attack/adv-cache-3/queue/98-adv-cache-3-flip-ladder.sh
+++ b/tools/attack/adv-cache-3/queue/98-adv-cache-3-flip-ladder.sh
@@ -5,7 +5,7 @@
 set -u
 BIN=/srv/builds/_adv-cache-3/bin/adv-cache-3-dep; D=/srv/builds/_adv-cache-3/logs; mkdir -p $D
 T=${THREADS:-48}
-yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | grep -qiE "v5|class-v5"; do sleep 30; done; }
+yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n "/^waiting:/,\$p" | grep -E "owner=class-v5|v5.*owner=attack-pass" | grep -vq "owner=adv-"; do sleep 30; done; }
 run() { tag=$1; shift; yield_v5; echo "$(date -u +%FT%TZ) start $tag" >> $D/ledger.txt; /srv/builds/_bin/lease pool $T --min 16 --label "adv-cache-3 $tag" --owner adv-cache-3 -- $BIN "$@" > $D/$tag.log 2>&1; rc=$?; echo "$(date -u +%FT%TZ) end $tag rc=$rc" >> $D/ledger.txt; echo "$tag rc=$rc"; }
 echo $$ > $D/flip-batch.pid
 run flip-r2-2e18   skip --day 20730 --segments 4160 --rounds 2 --dep-samples 262144 --threads {cores}