diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index b12385a06..8b9f74054 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -72,6 +72,7 @@
         - (not (inventory_hostname in groups.get('clients', [])) or (inventory_hostname == groups.get('clients', [''])|first))
 
 - hosts: mons
+  any_errors_fatal: true
   tasks:
     - name: set ceph monitor install 'In Progress'
       run_once: true
@@ -82,6 +83,7 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mons
+  any_errors_fatal: true
   become: True
   gather_facts: false
   roles:
@@ -95,6 +97,7 @@
   serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS
 
 - hosts: mons
+  any_errors_fatal: true
   tasks:
     - name: set ceph monitor install 'Complete'
       run_once: true
@@ -105,6 +108,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mgrs
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -133,6 +137,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: osds
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -161,6 +166,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mdss
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -189,6 +195,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: rgws
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -217,6 +224,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: nfss
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -245,6 +253,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: rbdmirrors
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -273,6 +282,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: restapis
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -305,6 +315,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: clients
+  any_errors_fatal: true
   become: True
   gather_facts: false
   pre_tasks:
@@ -337,6 +348,7 @@
 - hosts:
     - iscsigws
     - iscsi-gws # for backward compatibility only!
+  any_errors_fatal: true
   gather_facts: false
   become: True
   pre_tasks:
@@ -363,6 +375,7 @@
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
 - hosts: mons
+  any_errors_fatal: true
   gather_facts: false
   become: True
   tasks:
@@ -379,4 +392,4 @@
         msg: "{{ ceph_status.stdout_lines }}"
       delegate_to: "{{ groups['mons'][0] }}"
       run_once: true
-      when: not ceph_status.failed
+      when: not ceph_status.failed
\ No newline at end of file
diff --git a/site.yml.sample b/site.yml.sample
index 5ecba702c..de25ff8e3 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -395,6 +395,7 @@
 - hosts: mons
   gather_facts: false
   become: True
+  any_errors_fatal: true
   tasks:
     - name: get ceph status from the first monitor
       command: ceph --cluster {{ cluster | default ('ceph') }} -s