diff --git a/install/OneClickInstall/install-Docker.sh b/install/OneClickInstall/install-Docker.sh
index 6184c3f7b9..5678b7dcd5 100644
--- a/install/OneClickInstall/install-Docker.sh
+++ b/install/OneClickInstall/install-Docker.sh
@@ -1304,6 +1304,7 @@ install_product () {
 		reconfigure EXTERNAL_PORT ${EXTERNAL_PORT}
 
 		docker-compose -f $BASE_DIR/migration-runner.yml up -d
+		docker wait ${PACKAGE_SYSNAME}-migration-runner
 		docker-compose -f $BASE_DIR/${PRODUCT}.yml up -d
 		docker-compose -f ${PROXY_YML} up -d
 		docker-compose -f $BASE_DIR/notify.yml up -d
diff --git a/install/common/product-configuration b/install/common/product-configuration
index 28f1c6ec4b..768f64933b 100644
--- a/install/common/product-configuration
+++ b/install/common/product-configuration
@@ -619,7 +619,9 @@ change_elasticsearch_config(){
 
 	sed -i '/^plugins\.security/d' /etc/opensearch/opensearch.yml
 	sed -i '/CN=kirk,OU=client,O=client,L=test, C=de/d' /etc/opensearch/opensearch.yml
-  	/usr/share/opensearch/bin/opensearch-plugin remove opensearch-security
+  	if /usr/share/opensearch/bin/opensearch-plugin list | grep -x "opensearch-security" > /dev/null 2>&1 ; then
+		/usr/share/opensearch/bin/opensearch-plugin remove opensearch-security > /dev/null 2>&1
+	fi
 
 	local ELASTIC_SEARCH_CONF_PATH="/etc/opensearch/opensearch.yml"
 	local ELASTIC_SEARCH_JAVA_CONF_PATH="/etc/opensearch/jvm.options";