diff --git a/cmapi/CMakeLists.txt b/cmapi/CMakeLists.txt
index a5d2a7cd4..b546560ed 100644
--- a/cmapi/CMakeLists.txt
+++ b/cmapi/CMakeLists.txt
@@ -84,7 +84,7 @@ INSTALL(FILES mcs_aws
 INSTALL(FILES mcs_gsutil
             PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
             DESTINATION ${BIN_DIR})
-INSTALL(FILES scripts/mcs_backup_manager.sh
+INSTALL(FILES scripts/mcs_backup_manager.sh scripts/cs_package_manager.sh
             PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
             DESTINATION ${BIN_DIR})
 
diff --git a/extra/cs_package_manager.sh b/cmapi/scripts/cs_package_manager.sh
similarity index 99%
rename from extra/cs_package_manager.sh
rename to cmapi/scripts/cs_package_manager.sh
index 7c7d47751..fd164ee7e 100644
--- a/extra/cs_package_manager.sh
+++ b/cmapi/scripts/cs_package_manager.sh
@@ -1480,7 +1480,7 @@ confirm_dbrmctl_ok() {
 pre_upgrade_dbrm_backup() {
 
     if [ ! -f "mcs_backup_manager.sh" ]; then
-        wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/develop/extra/mcs_backup_manager.sh; chmod +x mcs_backup_manager.sh;
+        wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/develop/cmapi/scripts/mcs_backup_manager.sh; chmod +x mcs_backup_manager.sh;
     fi;
     if ! source mcs_backup_manager.sh source ;then
         printf "\n[!!] Failed to source mcs_backup_manager.sh\n\n"
diff --git a/cmapi/scripts/mcs_backup_manager.sh b/cmapi/scripts/mcs_backup_manager.sh
index a2784b0ec..73d4456e3 100644
--- a/cmapi/scripts/mcs_backup_manager.sh
+++ b/cmapi/scripts/mcs_backup_manager.sh
@@ -3040,7 +3040,7 @@ validation_prechecks_for_dbrm_restore() {
 
     # Download cs_package_manager.sh if not exists
     if [ ! -f "cs_package_manager.sh" ]; then
-        wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/develop/extra/cs_package_manager.sh; chmod +x cs_package_manager.sh;
+        wget https://raw.githubusercontent.com/mariadb-corporation/mariadb-columnstore-engine/develop/cmapi/scripts/cs_package_manager.sh; chmod +x cs_package_manager.sh;
     fi;
     if source cs_package_manager.sh source ;then
         echo " - Sourced cs_package_manager.sh"