diff --git a/docs/helpers/global_vars.yaml b/docs/helpers/global_vars.yaml
index bbf01387a..25f11a915 100644
--- a/docs/helpers/global_vars.yaml
+++ b/docs/helpers/global_vars.yaml
@@ -2,66 +2,66 @@ variables:
 - rawname: CS3_GATEWAY
   path: services/idp/pkg/backends/cs3/bootstrap/cs3.go:76
   foundincode: true
-  name: CS3_GATEWAY
+  name: "CS3_GATEWAY"
   type: ""
   default_value: ""
   description: ""
-  do_ignore: false
+  do_ignore: true
 - rawname: CS3_MACHINE_AUTH_API_KEY
   path: services/idp/pkg/backends/cs3/bootstrap/cs3.go:77
   foundincode: true
-  name: CS3_MACHINE_AUTH_API_KEY
+  name: "CS3_MACHINE_AUTH_API_KEY"
   type: ""
   default_value: ""
   description: ""
-  do_ignore: false
+  do_ignore: true
 - rawname: MICRO_LOG_LEVEL
   path: ocis-pkg/log/log.go:34
   foundincode: true
-  name: MICRO_LOG_LEVEL
-  type: ""
-  default_value: ""
-  description: ""
+  name: "MICRO_LOG_LEVEL"
+  type: "string"
+  default_value: "Error"
+  description: "Set the log level for the internal go micro framework. Only change on supervision of ownCloud Support."
   do_ignore: false
 - rawname: MICRO_LOG_LEVEL
   path: ocis-pkg/log/log.go:30
   foundincode: true
-  name: MICRO_LOG_LEVEL
+  name: "MICRO_LOG_LEVEL"
   type: ""
   default_value: ""
   description: ""
-  do_ignore: false
+  do_ignore: true
 - rawname: registryEnv
   path: ocis-pkg/registry/registry.go:44
   foundincode: true
-  name: MICRO_REGISTRY
-  type: ""
+  name: "MICRO_REGISTRY"
+  type: "string"
   default_value: ""
-  description: ""
+  description: "Go micro registry type to use. Supported types are: 'nats', 'kubernetes', 'etcd', 'consul' and 'memory'. Will be selected automatically. Only change on supervision of ownCloud Support."
   do_ignore: false
 - rawname: registryAddressEnv
   path: ocis-pkg/registry/registry.go:42
   foundincode: true
-  name: MICRO_REGISTRY_ADDRESS
-  type: ""
+  name: "MICRO_REGISTRY_ADDRESS"
+  type: "string"
   default_value: ""
-  description: ""
+  description: "The bind address of the internal go micro framework. Only change on supervision of ownCloud Support."
   do_ignore: false
 - rawname: OCIS_BASE_DATA_PATH
   path: ocis-pkg/config/defaults/paths.go:23
   foundincode: true
-  name: OCIS_BASE_DATA_PATH
-  type: ""
-  default_value: ""
-  description: ""
+  name: "OCIS_BASE_DATA_PATH"
+  type: "string"
+  default_value: "'/var/lib/ocis' or '$HOME/.ocis/'"
+  description: "The base directory location used by several services and for user data. Predefined to '/var/lib/ocis' for container images (inside the container) or '$HOME/.ocis/' for binary releases. Can be adapted for services individually."
   do_ignore: false
 - rawname: OCIS_CONFIG_DIR
   path: ocis-pkg/config/defaults/paths.go:56
   foundincode: true
-  name: OCIS_CONFIG_DIR
-  type: ""
-  default_value: ""
-  description: ""
+  name: "OCIS_CONFIG_DIR"
+  type: "string"
+  default_value: "'/etc/ocis' or '$HOME/.ocis/config'"
+  description: "The default directory location for config files. Predefined to '/etc/ocis' for container images (inside the container) or '$HOME/.ocis/config' for binary releases."
   do_ignore: false
 - rawname: parts[0]
   path: ocis-pkg/config/envdecode/envdecode.go:382
diff --git a/docs/templates/ADOC_global.tmpl b/docs/templates/ADOC_global.tmpl
index 45f6af962..6b0f5478f 100644
--- a/docs/templates/ADOC_global.tmpl
+++ b/docs/templates/ADOC_global.tmpl
@@ -22,7 +22,6 @@ a| [subs=-attributes]
 ++{{.DefaultValue}} ++
 a| [subs=-attributes]
 ++{{.Description}} ++
-a| [subs=-attributes]
 
 {{- end }}
 |===