diff --git a/hbase-assembly/.blazar.yaml b/hbase-assembly/.blazar.yaml
index e6609f3665ea..d9bf460d0e9b 100644
--- a/hbase-assembly/.blazar.yaml
+++ b/hbase-assembly/.blazar.yaml
@@ -1,12 +1,12 @@
 buildpack:
   name: Blazar-Buildpack-Java
 
-
 provides:
   - name: hbase-rpm
 
 env:
-  RPMS_OUTPUT_DIR: "$WORKSPACE/generated_rpms"
+  RPM_BUILD_COMMAND: "./rpm-build/build.sh"
+  RPM_REPOS: "8_hs-hbase${GIT_NON_DEFAULT_BRANCH:+-develop} aarch64_8_hs-hbase${GIT_NON_DEFAULT_BRANCH:+-develop}"
   MAVEN_PHASE: package assembly:single
 
 before:
@@ -14,22 +14,6 @@ before:
     commands:
       - $WORKSPACE/build-scripts/prepare_environment.sh
 
-after:
-  onSuccess:
-    - description: "Ensure $RPMS_OUTPUT_DIR exists"
-      commands:
-        - mkdir -p $RPMS_OUTPUT_DIR
-
-    - description: "Create RPM Package"
-      commands:
-        - ./rpm-build/build.sh
-
-    - description: "List RPMs in $RPMS_OUTPUT_DIR"
-      commands:
-        - echo "The following Rpms are ready for upload"
-        - ls -lah $RPMS_OUTPUT_DIR
-
-    - description: "Publish RPM"
-      container: host
-      commands:
-        - ./rpm-build/upload-rpm.sh
+stepActivation:
+  uploadRpms:
+    branchRegexes: [".*"]
diff --git a/hbase-assembly/rpm-build/upload-rpm.sh b/hbase-assembly/rpm-build/upload-rpm.sh
deleted file mode 100755
index 7437beaf8610..000000000000
--- a/hbase-assembly/rpm-build/upload-rpm.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-MINOR_VERSION="2.5"
-MAIN_BRANCH="hubspot-${MINOR_VERSION}"
-
-if [[ "$GIT_BRANCH" = "$MAIN_BRANCH" ]]; then
-   repos=( "8_hs-hbase" "aarch64_8_hs-hbase" )
-else
-    repos=( "8_hs-hbase-develop" "aarch64_8_hs-hbase-develop" )
-fi
-
-for repo in "${repos[@]}"; do
-  rpm-upload --rpms-dir=$WORKSPACE/generated_rpms/ --repo-name $repo
-done