diff --git a/deploy/jjb.sh b/deploy/jjb.sh
index 2314a7f3d..5ebd3d89a 100755
--- a/deploy/jjb.sh
+++ b/deploy/jjb.sh
@@ -63,7 +63,8 @@ oc logs "${jjb_pod}"
 
 # delete the job, so a next run can create it again
 oc process -f "jjb-${CMD}.yaml" -p=SESSION="${SESSION}" | oc delete --wait -f -
-oc delete pod "${jjb_pod}"
+# depending on the OpenShift version, the pod gets deleted automatically
+oc delete --ignore-not-found pod "${jjb_pod}"
 
 # return the exit status of the pod
 [ "${status}" = 'Succeeded' ]