diff --git a/docs/plugins.rst.j2 b/docs/plugins.rst.j2
index 9adb0deb25..d47bff0623 100644
--- a/docs/plugins.rst.j2
+++ b/docs/plugins.rst.j2
@@ -21,7 +21,14 @@
 **Configuration**
 
 {% for field in container_fields(PLUGIN._data_class) %}
-    {% if field.name in ('how', 'name', 'where') and field.internal != true %}
+    {% if (
+        field.name not in ('how', 'name', 'where', '_OPTIONLESS_FIELDS')
+        and field.internal != true
+        and (
+            not PLUGIN._data_class._OPTIONLESS_FIELDS
+            or field.name not in PLUGIN._data_class._OPTIONLESS_FIELDS
+        )
+     ) %}
         {% set _, option, _, metadata = container_field(PLUGIN._data_class, field.name) %}
 
         {% if metadata.metavar %}
diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst
index 7cbff0953c..21810feb14 100644
--- a/docs/plugins/index.rst
+++ b/docs/plugins/index.rst
@@ -5,6 +5,13 @@ Plugins
 
 Here you will find documentation for plugins shipped with tmt.
 
+.. warning::
+
+    Please, be aware that the documentation below is a work in progress. We are
+    working on fixing it, adding missing bits and generally making it better.
+    Also, it was originaly used for command line help only, therefore the
+    formatting is often suboptional.
+
 .. toctree::
     :maxdepth: 2