diff --git a/ci/singlecluster/Dockerfile b/ci/singlecluster/Dockerfile
index aa30c2ae4..e5b6566bb 100644
--- a/ci/singlecluster/Dockerfile
+++ b/ci/singlecluster/Dockerfile
@@ -39,14 +39,14 @@ RUN if command -v apt-get >/dev/null 2>&1; then \
 # TODO: update hive to support java 11+
 ENV    HADOOP_VERSION=3.1.2
 ENV      HIVE_VERSION=3.1.3
-ENV     HBASE_VERSION=2.3.7
+ENV     HBASE_VERSION=2.5.15
 ENV       TEZ_VERSION=0.9.2
 ENV        GO_VERSION=1.25.0
 
 # checksums from archive.apache.org
 ENV    HADOOP_SHA512="0e0ee817c89b3c4eb761eca7f16640742a83b0e99b6fda26c1bee2baabedad93aab86e252bf5f1e2381c6d464bc4003d10c7cc0f61b2062f4c59732ca24d1bd9"
 ENV      HIVE_SHA256="0c9b6a6359a7341b6029cc9347435ee7b379f93846f779d710b13f795b54bb16"
-ENV     HBASE_SHA512="1032521025660daa70260cdc931f52a26c87596be444451fe1fa88b526ede55e9d6b4220e91ff6f7422bec11f30d64fa6745e95a9c36971fdb1a264a2c745693"
+ENV     HBASE_SHA512="60a07d97ec68203c3494637f4abcb6fdc2fcc75c4c1b88b80d5d8616640e2a57a5193067849f677d441cae558ede69ee4e0ce489816cbcb9117db268fc316ae5"
 ENV      TEZ_SHA512="a2d94bd9fa778d42a8bac9d9da8e263e469ddfef93968b06434716554995f490231de5607541ac236e770aa0158b64250c38bc1cd57dbfa629fea705f2ffa2f5"
 
 # faster mirror:
diff --git a/ci/singlecluster/README.HDP3.md b/ci/singlecluster/README.HDP3.md
index 4afd6cea8..652cea868 100644
--- a/ci/singlecluster/README.HDP3.md
+++ b/ci/singlecluster/README.HDP3.md
@@ -6,7 +6,7 @@ It contains the following versions:
 
 - Hadoop 3.3.6
 - Hive 3.1.3
-- HBase 2.3.7
+- HBase 2.5.x
 - Tez 0.9.2
 
 This version of Single cluster requires users to make some manual changes to the configuration files once the tarball has been unpacked (see Initialization steps below).
diff --git a/docs/intro/intro_pxf.md b/docs/intro/intro_pxf.md
index df95f1bc5..e576c3d02 100644
--- a/docs/intro/intro_pxf.md
+++ b/docs/intro/intro_pxf.md
@@ -30,7 +30,7 @@ PXF bundles all of the Hadoop JAR files on which it depends, and supports the fo
 
 | Hadoop Version | Hive Server Version | HBase Server Version |
 |----------------|---------------------|-------------|
-| 2.x, 3.1+ | 1.x, 2.x, 3.1+ | 2.3.7 |
+| 2.x, 3.1+ | 1.x, 2.x, 3.1+ | 2.5.x |
 
 ## Architectural Overview
 
diff --git a/server/build.gradle b/server/build.gradle
index dfc9772d6..7dd37720c 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -102,7 +102,8 @@ configure(javaProjects) {
             dependency("org.apache.htrace:htrace-core:3.1.0-incubating")
             dependency("org.apache.htrace:htrace-core4:4.2.0-incubating")
 
-            dependency("org.apache.zookeeper:zookeeper:3.4.6")
+            dependency("org.apache.zookeeper:zookeeper:3.8.6")
+            dependency("org.apache.zookeeper:zookeeper-jute:3.8.6")
             dependency("org.codehaus.woodstox:stax2-api:3.1.4")
             dependency("org.datanucleus:datanucleus-api-jdo:4.2.4")
             dependency("org.datanucleus:datanucleus-core:4.1.17")
@@ -151,14 +152,14 @@ configure(javaProjects) {
                 entry("hbase-metrics-api")
                 entry("hbase-metrics")
             }
-            dependencySet(group:"org.apache.hbase.thirdparty", version:"3.3.0") {
+            dependencySet(group:"org.apache.hbase.thirdparty", version:"4.1.13") {
                 entry("hbase-shaded-protobuf")
                 entry("hbase-shaded-miscellaneous")
                 entry("hbase-shaded-gson")
                 entry("hbase-shaded-netty")
                 entry("hbase-unsafe")
             }
-            dependency("org.apache.yetus:audience-annotations:0.5.0")
+            dependency("org.apache.yetus:audience-annotations:0.13.0")
             dependency("io.opentelemetry:opentelemetry-api:1.49.0")
             dependency("io.opentelemetry:opentelemetry-context:1.49.0")
             dependency("io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha")
diff --git a/server/gradle.properties b/server/gradle.properties
index ca1502370..9b3df9dd4 100644
--- a/server/gradle.properties
+++ b/server/gradle.properties
@@ -21,7 +21,7 @@ license=ASL 2.0
 hadoopVersion=2.10.2
 hiveVersion=2.3.8
 hiveStorageApiVersion=2.7.3
-hbaseVersion=2.3.7
+hbaseVersion=2.5.15
 junitVersion=4.11
 parquetVersion=1.15.2
 awsJavaSdk=1.12.261
diff --git a/server/pxf-hbase/build.gradle b/server/pxf-hbase/build.gradle
index 5924b8f22..6d69f3ef1 100644
--- a/server/pxf-hbase/build.gradle
+++ b/server/pxf-hbase/build.gradle
@@ -33,6 +33,7 @@ dependencies {
     implementation("org.apache.hbase.thirdparty:hbase-shaded-miscellaneous") { transitive = false }
     implementation("org.apache.hbase.thirdparty:hbase-shaded-gson")          { transitive = false }
     implementation("org.apache.hbase.thirdparty:hbase-shaded-netty")         { transitive = false }
+    implementation("org.apache.hbase.thirdparty:hbase-unsafe")               { transitive = false }
     implementation("org.apache.commons:commons-lang3")                       { transitive = false }
     implementation("org.apache.commons:commons-crypto")                      { transitive = false }
     implementation("org.apache.hadoop:hadoop-common")                        { transitive = false }
@@ -45,6 +46,7 @@ dependencies {
     implementation("org.apache.hbase:hbase-protocol")                        { transitive = false }
     implementation("com.google.protobuf:protobuf-java")                      { transitive = false }
     implementation("org.apache.zookeeper:zookeeper")                         { transitive = false }
+    implementation("org.apache.zookeeper:zookeeper-jute")                    { transitive = false }
     implementation("io.netty:netty-common")                                  { transitive = false }
     implementation("io.netty:netty-transport")                               { transitive = false }
 //  skip JRuby - it is part of interactive shell