diff --git a/build/kibana/bin/kibana-docker b/build/kibana/bin/kibana-docker
index 8f91c9e..2cf3aa4 100755
--- a/build/kibana/bin/kibana-docker
+++ b/build/kibana/bin/kibana-docker
@@ -73,4 +73,17 @@ for kibana_var in ${kibana_vars[*]}; do
     fi
 done
 
-exec /usr/share/kibana/bin/kibana ${longopts}
+# The virtual file /proc/self/cgroup should list the current cgroup
+# membership. For each hierarchy, you can follow the cgroup path from
+# this file to the cgroup filesystem (usually /sys/fs/cgroup/) and
+# introspect the statistics for the cgroup for the given
+# hierarchy. Alas, Docker breaks this by mounting the container
+# statistics at the root while leaving the cgroup paths as the actual
+# paths. Therefore, Kibana provides a mechanism to override
+# reading the cgroup path from /proc/self/cgroup and instead uses the
+# cgroup path defined the configuration properties
+# cpu.cgroup.path.override and cpuacct.cgroup.path.override.
+# Therefore, we set this value here so that cgroup statistics are
+# available for the container this process will run in.
+
+exec /usr/share/kibana/bin/kibana --cpu.cgroup.path.override=/ --cpuacct.cgroup.path.override=/ ${longopts}