diff --git a/.gitignore b/.gitignore
index c85be70e7..744134dd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,6 +134,7 @@ oam/install_scripts/columnstoreSyslogSetup.sh
 oam/install_scripts/columnstore_module_installer.sh
 oam/install_scripts/disable-rep-columnstore.sh
 oam/install_scripts/mariadb-columnstore.service
+oam/install_scripts/mariadb-columnstore-start.sh
 oam/install_scripts/mariadb-command-line.sh
 oam/install_scripts/master-rep-columnstore.sh
 oam/install_scripts/mcs-controllernode.service
diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt
index cc81f68ca..d698dabf3 100644
--- a/oam/install_scripts/CMakeLists.txt
+++ b/oam/install_scripts/CMakeLists.txt
@@ -6,6 +6,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstoreLogRotate.in" "${CMAKE_CU
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore-start.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore-start.sh" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh" @ONLY)
diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index 3e654039e..ad0f9d259 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/oam/install_scripts/columnstore-post-install.in
@@ -226,7 +226,7 @@ rm -f $lockdir/columnstore
 
 # This was the last place of postConfigure. RIP
 
-/usr/sbin/install_mcs_mysql.sh --tmpdir=$tmpDir
+@ENGINE_BINDIR@/install_mcs_mysql.sh --tmpdir=$tmpDir
 
 # Restart MDB to enable plugin
 systemctl cat mariadb.service > /dev/null 2>&1
diff --git a/oam/install_scripts/mariadb-columnstore-start.sh b/oam/install_scripts/mariadb-columnstore-start.sh.in
similarity index 86%
rename from oam/install_scripts/mariadb-columnstore-start.sh
rename to oam/install_scripts/mariadb-columnstore-start.sh.in
index aaeaacd7e..0dbe6a729 100644
--- a/oam/install_scripts/mariadb-columnstore-start.sh
+++ b/oam/install_scripts/mariadb-columnstore-start.sh.in
@@ -15,7 +15,7 @@ flock -n "$fd_lock" || exit 0
 /bin/systemctl start mcs-dmlproc
 /bin/systemctl start mcs-ddlproc
 sleep 2
-su -s /bin/sh -c 'dbbuilder 7' mysql 1> /tmp/columnstore_tmp_files/dbbuilder.log
+su -s /bin/sh -c '@ENGINE_BINDIR@/dbbuilder 7' mysql 1> /tmp/columnstore_tmp_files/dbbuilder.log
 
 flock -u "$fd_lock"