diff --git a/scripts/components/performance-analyzer-rca/build.sh b/scripts/components/performance-analyzer-rca/build.sh
deleted file mode 100755
index 084f4fbdf5..0000000000
--- a/scripts/components/performance-analyzer-rca/build.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-
-set -ex
-
-function usage() {
-    echo "Usage: $0 [args]"
-    echo ""
-    echo "Arguments:"
-    echo -e "-v VERSION\t[Required] OpenSearch version."
-    echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'."
-    echo -e "-p PLATFORM\t[Optional] Platform, ignored."
-    echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored."
-    echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'."
-    echo -e "-h help"
-}
-
-while getopts ":h:v:s:o:p:a:" arg; do
-    case $arg in
-        h)
-            usage
-            exit 1
-            ;;
-        v)
-            VERSION=$OPTARG
-            ;;
-        s)
-            SNAPSHOT=$OPTARG
-            ;;
-        o)
-            OUTPUT=$OPTARG
-            ;;
-        p)
-            PLATFORM=$OPTARG
-            ;;
-        a)
-            ARCHITECTURE=$OPTARG
-            ;;
-        :)
-            echo "Error: -${OPTARG} requires an argument"
-            usage
-            exit 1
-            ;;
-        ?)
-            echo "Invalid option: -${arg}"
-            exit 1
-            ;;
-    esac
-done
-
-if [ -z "$VERSION" ]; then
-    echo "Error: You must specify the OpenSearch version"
-    usage
-    exit 1
-fi
-
-[[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT
-[ -z "$OUTPUT" ] && OUTPUT=artifacts
-
-./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -x test
diff --git a/scripts/components/performance-analyzer/build.sh b/scripts/components/performance-analyzer/build.sh
index 57640ddaaa..92fb1d6e0e 100755
--- a/scripts/components/performance-analyzer/build.sh
+++ b/scripts/components/performance-analyzer/build.sh
@@ -14,13 +14,14 @@ function usage() {
     echo "Arguments:"
     echo -e "-v VERSION\t[Required] OpenSearch version."
     echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'."
+    echo -e "-q QUALIFIER\t[Optional] Build qualifier."
     echo -e "-p PLATFORM\t[Optional] Platform, ignored."
     echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored."
     echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'."
     echo -e "-h help"
 }
 
-while getopts ":h:v:s:o:p:a:" arg; do
+while getopts ":h:v:q:s:o:p:a:" arg; do
     case $arg in
         h)
             usage
@@ -29,6 +30,9 @@ while getopts ":h:v:s:o:p:a:" arg; do
         v)
             VERSION=$OPTARG
             ;;
+        q)
+            QUALIFIER=$OPTARG
+            ;;
         s)
             SNAPSHOT=$OPTARG
             ;;
@@ -59,9 +63,10 @@ if [ -z "$VERSION" ]; then
     exit 1
 fi
 
+[[ ! -z "$QUALIFIER" ]] && VERSION=$VERSION-$QUALIFIER
 [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT
 [ -z "$OUTPUT" ] && OUTPUT=artifacts
 
-./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -x test
+./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER -x test
 mkdir -p $OUTPUT/plugins
 cp ./build/distributions/*.zip $OUTPUT/plugins