diff --git a/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_10.2.sh b/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_10.2.sh
index 7d6554f7f0..cc81da873c 100755
--- a/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_10.2.sh
+++ b/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_10.2.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package       : azure-core-cpp
-# Version       : 1.16.3
+# Version       : azure-core_1.16.3
 # Source repo   : https://github.com/Azure/azure-sdk-for-cpp
 # Tested on     : UBI:10.2
 # Language      : C++
@@ -20,7 +20,7 @@
 
 PACKAGE_NAME=azure-core-cpp
 PACKAGE_DIR=azure-sdk-for-cpp
-PACKAGE_VERSION=${1:-"1.16.3"}
+PACKAGE_VERSION=${1:-"azure-core_1.16.3"}
 PACKAGE_URL=https://github.com/Azure/azure-sdk-for-cpp
 WORKING_DIR=$(pwd)
 
@@ -77,7 +77,7 @@ if ! git clone $PACKAGE_URL $PACKAGE_DIR; then
     exit 1
 fi
 cd $PACKAGE_DIR
-git checkout azure-core_$PACKAGE_VERSION
+git checkout $PACKAGE_VERSION
 SOURCE_DIR=$(pwd)
 
 # Build azure-core only — install into a local prefix for wheel packaging
@@ -196,7 +196,7 @@ if [ -n "${_PYPROJECT_SRC}" ]; then
 else
     wget https://raw.githubusercontent.com/ppc64le/build-scripts/refs/heads/master/a/azure-core-cpp/pyproject.toml
 fi
-sed -i "s/{PACKAGE_VERSION}/${PACKAGE_VERSION}/g" pyproject.toml
+sed -i "s/{PACKAGE_VERSION}/${PACKAGE_VERSION#azure-core_}/g" pyproject.toml
 
 if ! python3 -m pip install . --no-build-isolation; then
     echo "------------------$PACKAGE_NAME:Wheel_build_fails-------------------------------------"
diff --git a/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_8.10.sh b/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_8.10.sh
index e0309a07f4..2d6da89160 100755
--- a/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_8.10.sh
+++ b/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_8.10.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package       : azure-core-cpp
-# Version       : 1.16.3
+# Version       : azure-core_1.16.3
 # Source repo   : https://github.com/Azure/azure-sdk-for-cpp
 # Tested on     : UBI:8.10
 # Language      : C++
@@ -19,7 +19,7 @@
 # -----------------------------------------------------------------------------
 
 PACKAGE_NAME=azure-core-cpp
-PACKAGE_VERSION=${1:-"1.16.3"}
+PACKAGE_VERSION=${1:-"azure-core_1.16.3"}
 PACKAGE_URL=https://github.com/Azure/azure-sdk-for-cpp
 WORKING_DIR=$(pwd)
 
@@ -82,7 +82,7 @@ cmake --version
 rm -rf azure-sdk-for-cpp
 git clone $PACKAGE_URL
 cd azure-sdk-for-cpp
-git checkout azure-core_$PACKAGE_VERSION
+git checkout $PACKAGE_VERSION
 SOURCE_DIR=$(pwd)
 
 # Build azure-core only — install into a local prefix for wheel packaging
@@ -175,7 +175,7 @@ if [ -n "${_PYPROJECT_SRC}" ]; then
 else
     wget https://raw.githubusercontent.com/ppc64le/build-scripts/refs/heads/master/a/azure-core-cpp/pyproject.toml
 fi
-sed -i "s/{PACKAGE_VERSION}/${PACKAGE_VERSION}/g" pyproject.toml
+sed -i "s/{PACKAGE_VERSION}/${PACKAGE_VERSION#azure-core_}/g" pyproject.toml
 
 if ! python3.9 -m pip install . --no-build-isolation; then
     echo "------------------$PACKAGE_NAME:Wheel_build_fails-------------------------------------"
diff --git a/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_9.8.sh b/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_9.8.sh
index 56e229addc..bfad156b61 100755
--- a/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_9.8.sh
+++ b/a/azure-core-cpp/azure-core-cpp_1.16.3_ubi_9.8.sh
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------------------
 #
 # Package       : azure-core-cpp
-# Version       : 1.16.3
+# Version       : azure-core_1.16.3
 # Source repo   : https://github.com/Azure/azure-sdk-for-cpp
 # Tested on     : UBI:9.8
 # Language      : C++
@@ -19,7 +19,7 @@
 # -----------------------------------------------------------------------------
 
 PACKAGE_NAME=azure-core-cpp
-PACKAGE_VERSION=${1:-"1.16.3"}
+PACKAGE_VERSION=${1:-"azure-core_1.16.3"}
 PACKAGE_URL=https://github.com/Azure/azure-sdk-for-cpp
 WORKING_DIR=$(pwd)
 
@@ -79,7 +79,7 @@ cmake --version
 rm -rf azure-sdk-for-cpp
 git clone $PACKAGE_URL
 cd azure-sdk-for-cpp
-git checkout azure-core_$PACKAGE_VERSION
+git checkout $PACKAGE_VERSION
 SOURCE_DIR=$(pwd)
 
 # Build azure-core only — install into a local prefix for wheel packaging
@@ -172,7 +172,7 @@ if [ -n "${_PYPROJECT_SRC}" ]; then
 else
     wget https://raw.githubusercontent.com/ppc64le/build-scripts/refs/heads/master/a/azure-core-cpp/pyproject.toml
 fi
-sed -i "s/{PACKAGE_VERSION}/${PACKAGE_VERSION}/g" pyproject.toml
+sed -i "s/{PACKAGE_VERSION}/${PACKAGE_VERSION#azure-core_}/g" pyproject.toml
 
 if ! python3 -m pip install . --no-build-isolation; then
     echo "------------------$PACKAGE_NAME:Wheel_build_fails-------------------------------------"
diff --git a/a/azure-core-cpp/build_info.json b/a/azure-core-cpp/build_info.json
index d95cda54a1..5b542bb073 100644
--- a/a/azure-core-cpp/build_info.json
+++ b/a/azure-core-cpp/build_info.json
@@ -2,7 +2,7 @@
     "maintainer": "Veenious-Geevarghese",
     "package_name": "azure-core-cpp",
     "github_url": "https://github.com/Azure/azure-sdk-for-cpp",
-    "version": "1.16.3",
+    "version": "azure-core_1.16.3",
     "default_branch": "main",
     "build_script": "azure-core-cpp_1.16.3_ubi_10.2.sh",
     "package_dir": "a/azure-core-cpp",
@@ -10,7 +10,7 @@
     "validate_build_script": true,
     "use_non_root_user": false,
     "wheel_build": true,
-    "1.16.3": {
+    "azure-core_1.16.3": {
         "build_script": [
             "azure-core-cpp_1.16.3_ubi_8.10.sh",
             "azure-core-cpp_1.16.3_ubi_9.8.sh",