diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 933c497838..4a17328f86 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -97,6 +97,8 @@ outputs:
             privileged: true
             user: root
             restart: always
+            healthcheck:
+              test: /openstack/healthcheck
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml
index d621ea0b9f..8866c6b910 100644
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@@ -37,6 +37,7 @@ parameters:
       - memory
       - processes
       - tcpconns
+      - unixsock
     type: comma_delimited_list
     description: >
       List of collectd plugins to activate on all overcloud hosts.  See
@@ -206,6 +207,8 @@ outputs:
             collectd::recurse: true
             collectd::purge_config: true
             collectd::minimum_version: "5.7"
+            collectd::plugin::unixsock::socketgroup: root
+            collectd::plugin::unixsock::socketfile: /var/run/collectd-socket
             tripleo.collectd.plugins.collectd:
               yaql:
                 data: