diff --git a/src/main/asciidoc/_chapters/community.adoc b/src/main/asciidoc/_chapters/community.adoc
index c594481afff..bdfef419654 100644
--- a/src/main/asciidoc/_chapters/community.adoc
+++ b/src/main/asciidoc/_chapters/community.adoc
@@ -168,6 +168,11 @@ If this list goes out of date or you can't reach the listed person, reach out to
 | Check the https://hbase.apache.org/downloads.html[download] page
 | *NOT YET*
 
+| 2.5
+| Andrew Purtell
+| Check the https://hbase.apache.org/downloads.html[download] page
+| *NOT YET*
+
 |===
 
 [[hbase.commit.msg.format]]
diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc
index 7f2c5f67eb6..8e25bf9ed78 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -317,12 +317,27 @@ link:https://hadoop.apache.org/cve_list.html[CVEs] so we drop the support in new
 
 [cols="1,2*^.^", options="header"]
 |===
-| | HBase-2.3.x | HBase-2.4.x
-|Hadoop-2.10.x | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+| | HBase-2.4.x | HBase-2.5.x
+|Hadoop-2.10.[0-1] | icon:check-circle[role="green"] | icon:times-circle[role="red"]
+|Hadoop-2.10.2+ | icon:check-circle[role="green"] | icon:check-circle[role="green"]
 |Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-3.1.1+ | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.2.x | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.3.x | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|Hadoop-3.1.1+ | icon:check-circle[role="green"] | icon:times-circle[role="red"]
+|Hadoop-3.2.[0-2] | icon:check-circle[role="green"] | icon:times-circle[role="red"]
+|Hadoop-3.2.3+ | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|Hadoop-3.3.[0-1] | icon:check-circle[role="green"] | icon:times-circle[role="red"]
+|Hadoop-3.3.2+ | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|===
+
+.Hadoop version support matrix for EOM 2.3+ release lines
+
+[cols="1,1*^.^", options="header"]
+|===
+| | HBase-2.3.x
+|Hadoop-2.10.x | icon:check-circle[role="green"]
+|Hadoop-3.1.0 | icon:times-circle[role="red"]
+|Hadoop-3.1.1+ | icon:check-circle[role="green"]
+|Hadoop-3.2.x | icon:check-circle[role="green"]
+|Hadoop-3.3.x | icon:check-circle[role="green"]
 |===
 
 .Hadoop version support matrix for EOM 2.x release lines