diff --git a/ibm/mas_devops/roles/cp4d/tasks/prereqs/install-cpfs.yml b/ibm/mas_devops/roles/cp4d/tasks/prereqs/install-cpfs.yml
index 906a1d154e..4c80891b16 100644
--- a/ibm/mas_devops/roles/cp4d/tasks/prereqs/install-cpfs.yml
+++ b/ibm/mas_devops/roles/cp4d/tasks/prereqs/install-cpfs.yml
@@ -121,8 +121,10 @@
     definition:
       spec:
         size: "{{ cpfs_size }}"
+  register: result
   retries: 5 # This can fail transiently if the common service webhook is not yet ready
   delay: 12
+  until: not result.failed
 
 - name: "Wait for CommonService instance to be ready in {{ cpd_operators_namespace }}"
   kubernetes.core.k8s_info: