diff --git a/docs/templates/ADOC.tmpl b/docs/templates/ADOC.tmpl
index 4f7f0b3221..183c4bf729 100644
--- a/docs/templates/ADOC.tmpl
+++ b/docs/templates/ADOC.tmpl
@@ -1,43 +1,47 @@
 // set the attribute to true or leave empty, true without any quotes.
+
 :show-deprecation: {{ .HasDeprecations }}
 
 ifeval::[{show-deprecation} == true]
+
 [[deprecation-note]]
 [caption=]
 [width="100%",cols="~,~,~,~",options="header"]
-| ===                    |
-| Deprecation Version    |
-| Removal Version        |
-| Deprecation Info       |
-| Deprecation Replacment |
+|===
+| Deprecation Version
+| Removal Version
+| Deprecation Info
+| Deprecation Replacment
 
 {{- range .Deprecations }}
 | {{ .DeprecationVersion }}
 | {{ .RemovalVersion }}
 | {{ .DeprecationInfo }}
 | {{ .DeprecationReplacement }}
-| ===
 {{- end }}
+|===
+
 endif::[]
 
 [caption=]
 .Environment variables for the {{ .ExtensionName }} service
 [width="100%",cols="~,~,~,~",options="header"]
-| ===           |
-| Name          |
-| Type          |
-| Default Value |
-| Description   |
+|===
+| Name
+| Type
+| Default Value
+| Description
 
 {{- range .Fields}}
-:is-deprecated: {{ .IsDeprecated }}
-| {{- range $i, $value := .EnvVars }}{{- if $i }} + |
+
+a| {{- range $i, $value := .EnvVars }}{{- if $i }} +
 {{ end -}}
 `{{- $value }}`
 {{- end }} +
+:is-deprecated: {{ .IsDeprecated }}
 ifeval::[{is-deprecated} == true] 
 xref:deprecation-note[Deprecation Note] 
-endif::[] 
+endif::[]
 a| [subs=-attributes]
 ++{{.Type}} ++
 a| [subs=-attributes]
@@ -46,5 +50,5 @@ a| [subs=-attributes]
 {{.Description}}
 
 {{- end }}
-| === |
+|===