diff --git a/docs/templates/ADOC_extended.tmpl b/docs/templates/ADOC_extended.tmpl
index 16c558f0d..829570039 100644
--- a/docs/templates/ADOC_extended.tmpl
+++ b/docs/templates/ADOC_extended.tmpl
@@ -2,13 +2,12 @@
 
 [caption=]
 .Environment variables with extended scope not included in a service
-[width="100%",cols="~,~,~,~",options="header"]
+[width="100%",cols="35%,10%,18%,~"",options="header"]
 |===
 | Name
 | Type
 | Default Value
 | Description
-
 {{- range .Variables}}
 
 {{- if .Ignore }}
diff --git a/docs/templates/ADOC_global.tmpl b/docs/templates/ADOC_global.tmpl
index 5c9d02a24..424c01048 100644
--- a/docs/templates/ADOC_global.tmpl
+++ b/docs/templates/ADOC_global.tmpl
@@ -1,12 +1,5 @@
 // collected through docs/helpers/adoc-generator.go.tmpl
 
-Note that some global environment variables have been deprecated and replaced by a new one starting with `OCIS_` for naming consistency:
-
-* All envvars starting with `LDAP_`
-* All envvars starting with `IDM_` except `IDM_CREATE_DEMO_USERS`
-* The following envvars: `OCIS_REVA_GATEWAY`, `STORAGE_TRANSFER_SECRET`, `OCIS_ASYNC_UPLOADS`, `USERLOG_MACHINE_AUTH_API_KEY`.
-* Note that `WEB_UI_CONFIG_FILE` is not a global envar and will dropped from the list in a later release.
-
 [.landscape]
 [caption=]
 .Environment variables with global scope available in multiple services
@@ -17,9 +10,7 @@ Note that some global environment variables have been deprecated and replaced by
 | Type
 | Default Value
 | Description
-
 {{ range . }}
-
 a| `{{ .Name }}`
 
 a| [subs=attributes+]