diff --git a/.blazar.yaml b/.blazar.yaml
index b428c52712bf..66238b9b52f3 100644
--- a/.blazar.yaml
+++ b/.blazar.yaml
@@ -4,7 +4,7 @@ buildpack:
 env:
   MAVEN_PHASE: "package assembly:single deploy"
   HADOOP_DEP_VERSION: "3.3.6-hubspot-SNAPSHOT"
-  MAVEN_ARGS: "-Phadoop-3.0 -Dhadoop.profile=3.0 -Dhadoop-three.version=$HADOOP_DEP_VERSION -Dgpg.skip=true -DskipTests -DdeployAtEnd -pl hbase-assembly -am"
+  MAVEN_BUILD_ARGS: "-Phadoop-3.0 -Dhadoop.profile=3.0 -Dhadoop-three.version=$HADOOP_DEP_VERSION -Dgpg.skip=true -DskipTests -DdeployAtEnd -pl hbase-assembly -am"
 
   # Below variables are generated in prepare_environment.sh.
   # The build environment requires environment variables to be explicitly defined before they may
diff --git a/build-scripts/prepare_environment.sh b/build-scripts/prepare_environment.sh
index bd6004f7b002..1a59f8f6ede3 100755
--- a/build-scripts/prepare_environment.sh
+++ b/build-scripts/prepare_environment.sh
@@ -89,9 +89,9 @@ write-build-env-var YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8 "$YUM_REPO_UPLOAD_OVERRIDE
 # with 2.6-hubspot-SNAPSHOT which is not very useful as a point of reference.
 # Another option would be to pass in our FULL_BUILD_VERSION but that might cause some funniness
 # with the expectations in VersionInfo.compareVersion().
-write-build-env-var MAVEN_ARGS "$MAVEN_ARGS -Dversioninfo.version=$HBASE_VERSION"
+write-build-env-var MAVEN_BUILD_ARGS "$MAVEN_BUILD_ARGS -Dversioninfo.version=$HBASE_VERSION"
 
 echo "Building HBase version $HBASE_VERSION"
 echo "Will deploy to nexus with version $SET_VERSION"
 echo "Will create rpm with version $FULL_BUILD_VERSION"
-echo "Will run maven with extra args $MAVEN_ARGS"
+echo "Will run maven with extra args $MAVEN_BUILD_ARGS"
diff --git a/hbase-rpm/.blazar.yaml b/hbase-rpm/.blazar.yaml
index 5ed0905e8c3f..67e6eaa55766 100644
--- a/hbase-rpm/.blazar.yaml
+++ b/hbase-rpm/.blazar.yaml
@@ -14,7 +14,7 @@ env:
   HBASE_VERSION: ""
   PKG_RELEASE: ""
   FULL_BUILD_VERSION: ""
-  MAVEN_ARGS: ""
+  MAVEN_BUILD_ARGS: ""
 
 depends:
   - hbase
diff --git a/hubspot-client-bundles/.blazar.yaml b/hubspot-client-bundles/.blazar.yaml
index 02a8cae21e84..4e5f77586d92 100644
--- a/hubspot-client-bundles/.blazar.yaml
+++ b/hubspot-client-bundles/.blazar.yaml
@@ -11,7 +11,7 @@ env:
   HBASE_VERSION: ""
   PKG_RELEASE: ""
   FULL_BUILD_VERSION: ""
-  MAVEN_ARGS: ""
+  MAVEN_BUILD_ARGS: ""
 
 before:
   - description: "Prepare build environment"
diff --git a/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml
index d1117419da96..c8cf3cf96e6f 100644
--- a/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml
+++ b/hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml
@@ -11,7 +11,7 @@ env:
   HBASE_VERSION: ""
   PKG_RELEASE: ""
   FULL_BUILD_VERSION: ""
-  MAVEN_ARGS: ""
+  MAVEN_BUILD_ARGS: ""
 
 before:
   - description: "Prepare build environment"
diff --git a/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml
index 384174d248ee..70b6be595ce4 100644
--- a/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml
+++ b/hubspot-client-bundles/hbase-client-bundle/.blazar.yaml
@@ -11,7 +11,7 @@ env:
   HBASE_VERSION: ""
   PKG_RELEASE: ""
   FULL_BUILD_VERSION: ""
-  MAVEN_ARGS: ""
+  MAVEN_BUILD_ARGS: ""
 
 before:
   - description: "Prepare build environment"
diff --git a/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml b/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml
index da76127c70c8..b03937567698 100644
--- a/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml
+++ b/hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml
@@ -11,7 +11,7 @@ env:
   HBASE_VERSION: ""
   PKG_RELEASE: ""
   FULL_BUILD_VERSION: ""
-  MAVEN_ARGS: ""
+  MAVEN_BUILD_ARGS: ""
 
 before:
   - description: "Prepare build environment"
diff --git a/hubspot-client-bundles/pom.xml b/hubspot-client-bundles/pom.xml
index 04367ebd3d68..0adceb81f9e1 100644
--- a/hubspot-client-bundles/pom.xml
+++ b/hubspot-client-bundles/pom.xml
@@ -20,6 +20,8 @@
     unexpected netty dependencies. This is problematic with the shade plugin because it flattens
     the dependency tree, so those dependencies become direct dependencies of the bundle. -->
     <zookeeper.version>3.6.3-shaded-SNAPSHOT</zookeeper.version>
+
+    <revision>2.5-hubspot-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>
@@ -58,6 +60,11 @@
         <artifactId>hbase-shaded-netty-tcnative</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-compression-zstd</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-client</artifactId>