diff --git a/playbooks/prod_web.yml b/playbooks/prod_web.yml
index 31825de..939a75b 100755
--- a/playbooks/prod_web.yml
+++ b/playbooks/prod_web.yml
@@ -208,9 +208,6 @@
             command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit cron.service
           - name: Unit dbus.service
             command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit dbus.service
-          - name: Unit docker.service
-            command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit docker.service
-            hostgroup: "ansible,!tag-no-docker"
           - name: Unit ssh.service
             command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit ssh.service
           - name: Unit systemd-resolved.service
@@ -218,6 +215,19 @@
             hostgroup: "ansible,!role-hypervisor"
           - name: Users
             command: check_by_ssh!/usr/lib/nagios/plugins/check_users -w 3 -c 5
+          # Checks for Docker hosts
+          - name: Unit docker.service
+            command: check_by_ssh!/usr/local/bin/monitoring-scripts/check_systemd_unit docker.service
+            hostgroup: "ansible,!tag-no-docker"
+          - name: Docker Status
+            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --status running
+            hostgroup: tag-nagios-checkdocker
+          - name: Docker CPU Usage
+            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --cpu 85:90
+            hostgroup: tag-nagios-checkdocker
+          - name: Docker Memory Usage
+            command: check_by_ssh!/usr/bin/sudo /usr/local/bin/monitoring-scripts/check_docker --no-ok --memory 85:90:%
+            hostgroup: tag-nagios-checkdocker
           # Privileged checks
           # Required because check_disk may attempt to get the free space of
           # restricted mountpoints
diff --git a/playbooks/tags_nagios.yml b/playbooks/tags_nagios.yml
index b1e7058..2816fee 100755
--- a/playbooks/tags_nagios.yml
+++ b/playbooks/tags_nagios.yml
@@ -31,6 +31,7 @@
         line: "nagios-checker ALL = (root) NOPASSWD: {{ item }}"
       with_items:
         - /usr/lib/nagios/plugins/check_disk
+        - /usr/local/bin/monitoring-scripts/check_docker
         - /usr/local/bin/monitoring-scripts/check_temp
       tags: [ nagios, sudo ]
 - hosts: all