diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh
index 9be77c1f95..0ceb1ac5ff 100644
--- a/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh
+++ b/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh
@@ -54,7 +54,7 @@ function install_agent()
 {
   export SYSTEM_MANAGER_OVERRIDE=true
   _unpack_install_bundle "$1"
-  execute_cmd "/bin/bash ${PACKAGES}/installer.sh $CONFIG_FILE" "install"
+  execute_cmd "/bin/bash ${INSTALL_BASEDIR}/installer.sh $CONFIG_FILE" "install"
   return $?
 }
 
@@ -65,7 +65,7 @@ function upgrade_with_install_bundle()
 {
   export SYSTEM_MANAGER_OVERRIDE=true
   _unpack_install_bundle "$1"
-  execute_cmd "/bin/bash ${PACKAGES}/installer.sh -u" "upgrade"
+  execute_cmd "/bin/bash ${INSTALL_BASEDIR}/installer.sh -u" "upgrade"
   return $?
 }
 
diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh
index ad6b095ac4..a930a4d5bb 100755
--- a/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh
+++ b/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh
@@ -13,6 +13,7 @@ BASE_DIR=/opt/oracle
 BOOTSTRAP_HOME="$BASE_DIR/bootstrap"
 SCRIPTS=$BOOTSTRAP_HOME/scripts
 PACKAGES=$BOOTSTRAP_HOME/packages
+INSTALL_BASEDIR=$PACKAGES/mgmt_agent
 # shellcheck disable=SC2034
 UPGRADE_STAGE=$BOOTSTRAP_HOME/upgrade
 CONFIG_FILE="$BASE_DIR/mgmtagent_secret/input.rsp"