diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index 47eff29785..c219ce2d61 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -333,6 +333,17 @@ outputs:
                     echo "Could not retrieve and clear location constraint for VIP $v" 2>&1
                 fi
             done
+        - name: Set the cluster bundle timeout
+          when: step|int == 1
+          vars:
+            pacemaker_bundle_operation_timeout: {get_param: PacemakerBundleOperationTimeout}
+            container_cli: {get_param: ContainerCli}
+          block:
+            - name: Change the bundle operation timeout
+              command: "pcs resource op defaults timeout={{ pacemaker_bundle_operation_timeout|ternary(pacemaker_bundle_operation_timeout,'120s') }}"
+              when:
+                - "container_cli == 'podman'"
+
         - name: Stop pacemaker cluster
           when: step|int == 1
           pacemaker_cluster: state=offline