diff --git a/troubleshooting.rst b/troubleshooting.rst
index 797c5e2..86f2d02 100644
--- a/troubleshooting.rst
+++ b/troubleshooting.rst
@@ -103,6 +103,9 @@
     NetworkConfigNib created 03-06-2020 01:30 from FILE
     MulticastRouteNib created 03-06-2020 01:30 from FILE
 
+Alternatively, it is possible to use ``onos-diagnostics-k8s`` [#onos-diagnostics-k8s_src]_ [#onos-diagnostics_man]_
+in Kubernetes enabled environments.
+
 t3-load-snapshot
 =============================
 T3 offers this command to fill the NIB with snapshots of the network states at the execution time.
@@ -818,12 +821,14 @@
 - **Diagnostics**.
 
 We have built a tool ``onos-diagnostics`` [#onos-diagnostics_src]_ [#onos-diagnostics_man]_
-to help you easily collect and package ONOS diagnostics
+to help you easily collect and package ONOS diagnostics.
 
+Alternatively, you can use ``onos-diagnostics-k8s`` [#onos-diagnostics-k8s_src]_ [#onos-diagnostics_man]_.
 
 Reference
 =========
 
 .. [#onos-diagnostics_src] `<https://github.com/opennetworkinglab/onos/blob/master/tools/package/runtime/bin/onos-diagnostics>`_
 .. [#onos-diagnostics_man] `<https://wiki.onosproject.org/display/ONOS/ONOS+Remote+Admin+Tools>`_
+.. [#onos-diagnostics-k8s_src] `<https://github.com/opennetworkinglab/onos/blob/master/tools/package/runtime/bin/onos-diagnostics-k8s>`_
 .. [#trellis.py] `<https://github.com/opennetworkinglab/routing/blob/master/trellis/trellis.py>`_