diff --git a/Dockerfile b/Dockerfile
index 40b31b2c..5dfc819a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -145,4 +145,7 @@ COPY rootfs /
 EXPOSE 8000 514 514/udp 162 162/udp
 VOLUME [ "/data" ]
 
+HEALTHCHECK --start-period=1m \
+  CMD lnms health:check || exit 1
+
 ENTRYPOINT [ "/init" ]
diff --git a/examples/compose/compose.yml b/examples/compose/compose.yml
index c090df46..dc26e894 100644
--- a/examples/compose/compose.yml
+++ b/examples/compose/compose.yml
@@ -93,6 +93,8 @@ services:
 
   syslogng:
     image: librenms/librenms:latest
+    healthcheck:
+      disable: true
     container_name: librenms_syslogng
     hostname: librenms-syslogng
     cap_add:
@@ -126,6 +128,8 @@ services:
 
   snmptrapd:
     image: librenms/librenms:latest
+    healthcheck:
+      disable: true
     container_name: librenms_snmptrapd
     hostname: librenms-snmptrapd
     cap_add:
diff --git a/examples/traefik/compose.yml b/examples/traefik/compose.yml
index d5760232..d86a9c38 100644
--- a/examples/traefik/compose.yml
+++ b/examples/traefik/compose.yml
@@ -138,6 +138,8 @@ services:
 
   syslogng:
     image: librenms/librenms:latest
+    healthcheck:
+      disable: true
     container_name: librenms_syslog
     hostname: librenms-syslogng
     depends_on:
@@ -170,6 +172,8 @@ services:
 
   snmptrapd:
     image: librenms/librenms:latest
+    healthcheck:
+      disable: true
     container_name: librenms_snmptrapd
     hostname: librenms-snmptrapd
     depends_on:
diff --git a/test/compose.yml b/test/compose.yml
index c63305f2..546222ac 100644
--- a/test/compose.yml
+++ b/test/compose.yml
@@ -85,6 +85,8 @@ services:
 
   syslogng:
     image: ${LIBRENMS_IMAGE:-librenms/librenms:latest}
+    healthcheck:
+      disable: true
     container_name: librenms_syslogng
     hostname: librenms-syslogng
     cap_add:
@@ -118,6 +120,8 @@ services:
 
   snmptrapd:
     image: ${LIBRENMS_IMAGE:-librenms/librenms:latest}
+    healthcheck:
+      disable: true
     container_name: librenms_snmptrapd
     hostname: librenms-snmptrapd
     cap_add: