diff --git a/cesnet-central/deploy.sh b/cesnet-central/deploy.sh
index 764f9c63a3e45e60b080184d6bc56ca3221bfaab..16cc8812bec5d4d08c080e0206f40341f883a961 100755
--- a/cesnet-central/deploy.sh
+++ b/cesnet-central/deploy.sh
@@ -26,6 +26,6 @@ ansible-playbook playbooks/squid.yaml
 ansible-playbook playbooks/cvmfs.yaml
 
 # wait for finish
-while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 
 ansible-playbook playbooks/security-logs.yaml
diff --git a/cesnet-mcc/deploy.sh b/cesnet-mcc/deploy.sh
index 2d30999705c5b85c4e304778fd2a7be01f08b476..d051d3db500d634b87477fd9d339f8088dcd3bb6 100755
--- a/cesnet-mcc/deploy.sh
+++ b/cesnet-mcc/deploy.sh
@@ -46,7 +46,7 @@ ansible -m command -a '/root/squid-volume.sh' 'ingress[0]'
 ansible-playbook playbooks/k8s.yaml
 # ansible-playbook playbooks/squid.yaml
 # ansible-playbook playbooks/cvmfs.yaml
-while ansible -i ./inventory -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 # docker runtime directory after Kubernetes deployment (problem with unmounts)
 ansible -m copy -a 'src=terraform/docker-volume.sh dest=/root/ mode=preserve' 'ingress nfs worker gpu'
 ansible -m command -a '/root/docker-volume.sh' 'ingress nfs worker gpu'
diff --git a/production2/deploy.sh b/production2/deploy.sh
index c64fa1c8c12f32002e0649843a6ffbb6fcb00b62..5c6b5dd7d8e192e099d62173063bad6a59ce900f 100755
--- a/production2/deploy.sh
+++ b/production2/deploy.sh
@@ -44,7 +44,7 @@ ansible -m command -a '/root/squid-volume.sh' 'ingress[0]'
 
 # kubernetes
 ansible-playbook playbooks/k8s.yaml
-while ansible -i ./inventory -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 # docker runtime directory after Kubernetes deployment (problem with unmounts)
 ansible -m copy -a 'src=terraform/docker-volume.sh dest=/root/ mode=preserve' 'ingress nfs worker gpu'
 ansible -m command -a '/root/docker-volume.sh' 'ingress nfs worker gpu'
diff --git a/staging1/deploy.sh b/staging1/deploy.sh
index 2487b4b5ab53920b50e6093c4f14c2fb913b34a6..d87a2ea78683a2c43ceb5e1dccd4f542794cada2 100755
--- a/staging1/deploy.sh
+++ b/staging1/deploy.sh
@@ -44,7 +44,7 @@ ansible -m command -a '/root/squid-volume.sh' 'ingress[0]'
 
 # kubernetes
 ansible-playbook playbooks/k8s.yaml
-while ansible -i ./inventory -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 # docker runtime directory after Kubernetes deployment (problem with unmounts)
 ansible -m copy -a 'src=terraform/docker-volume.sh dest=/root/ mode=preserve' 'ingress nfs worker gpu'
 ansible -m command -a '/root/docker-volume.sh' 'ingress nfs worker gpu'
@@ -52,7 +52,7 @@ ansible-playbook playbooks/squid.yaml
 ansible-playbook playbooks/cvmfs.yaml
 
 # wait for finish
-while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 
 ansible-playbook playbooks/security-assets.yaml
 ansible-playbook playbooks/security-logs.yaml
diff --git a/staging2/deploy.sh b/staging2/deploy.sh
index f31cfb579cc3ae04a1eb6f157ff2ba512dd85330..64c1ce256a0ed605ac293a95463e14b20de3f98d 100755
--- a/staging2/deploy.sh
+++ b/staging2/deploy.sh
@@ -44,7 +44,7 @@ ansible -m command -a '/root/squid-volume.sh' 'ingress[0]'
 
 # kubernetes
 ansible-playbook playbooks/k8s.yaml
-while ansible -i ./inventory -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 # docker runtime directory after Kubernetes deployment (problem with unmounts)
 ansible -m copy -a 'src=terraform/docker-volume.sh dest=/root/ mode=preserve' 'ingress nfs worker gpu'
 ansible -m command -a '/root/docker-volume.sh' 'ingress nfs worker gpu'
@@ -52,4 +52,4 @@ ansible-playbook playbooks/squid.yaml
 ansible-playbook playbooks/cvmfs.yaml
 
 # wait for finish
-while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
diff --git a/testing/deploy.sh b/testing/deploy.sh
index 4f42d6efbc5145fdc03ff05569972980bbb47d4c..d7ac3c0b16001a2df300ce83ce86bca968b8dd15 100755
--- a/testing/deploy.sh
+++ b/testing/deploy.sh
@@ -46,7 +46,7 @@ ansible -m command -a '/root/scratch-volume.sh' 'ingress nfs worker gpu'
 
 # kubernetes
 ansible-playbook playbooks/k8s.yaml
-while ansible -i ./inventory -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
 # docker runtime directory after Kubernetes deployment (problem with unmounts)
 ansible -m copy -a 'src=terraform/docker-volume.sh dest=/root/ mode=preserve' 'ingress nfs worker gpu'
 ansible -m command -a '/root/docker-volume.sh' 'ingress nfs worker gpu'
@@ -54,4 +54,4 @@ ansible-playbook playbooks/squid.yaml
 ansible-playbook playbooks/cvmfs.yaml
 
 # wait for finish
-while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -v ' Running '; do sleep 5; done
+while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done