diff --git a/scripts/assemble.sh b/scripts/assemble.sh
index b64d987a72a04..9f25c304808b4 100755
--- a/scripts/assemble.sh
+++ b/scripts/assemble.sh
@@ -172,6 +172,21 @@ function remove_unneeded_files() {
     rm "$PATH_PLUGINS/opensearch-security/tools/install_demo_configuration.sh"
 }
 
+# ====
+# Add additional tools into packages
+# ====
+function add_wazuh_tools() {
+    local version
+    version=$(<VERSION)
+    version=${version%%.[[:digit:]]}
+    local download_url
+    download_url="https://packages-dev.wazuh.com/${version}"
+
+    wget -q "${download_url}/config.yml" -O $PATH_PLUGINS/opensearch-security/tools/config.yml
+    wget -q "${download_url}/wazuh-passwords-tool.sh "-O $PATH_PLUGINS/opensearch-security/tools/wazuh-passwords-tool.sh
+    wget -q "${download_url}/wazuh-certs-tool.sh" -O $PATH_PLUGINS/opensearch-security/tools/wazuh-certs-tool.sh
+}
+
 # ====
 # Copy performance analyzer service file
 # ====
@@ -231,6 +246,7 @@ function assemble_tar() {
     # Swap configuration files
     add_configuration_files
     remove_unneeded_files
+    add_wazuh_tools
 
     # Pack
     archive_name="wazuh-indexer-$(cat VERSION)"
@@ -267,6 +283,7 @@ function assemble_rpm() {
     # Swap configuration files
     add_configuration_files
     remove_unneeded_files
+    add_wazuh_tools
 
     # Generate final package
     local topdir
@@ -274,7 +291,6 @@ function assemble_rpm() {
     local spec_file="wazuh-indexer.rpm.spec"
     topdir=$(pwd)
     version=$(cat ./usr/share/wazuh-indexer/VERSION)
-    # TODO validate architecture
     rpmbuild --bb \
         --define "_topdir ${topdir}" \
         --define "_version ${version}" \
@@ -283,9 +299,7 @@ function assemble_rpm() {
 
     # Move to the root folder, copy the package and clean.
     cd ../../..
-
     package_name="wazuh-indexer-${version}-1.${SUFFIX}.${EXT}"
-
     cp "${TMP_DIR}/RPMS/${SUFFIX}/${package_name}" "${OUTPUT}/dist/$ARTIFACT_PACKAGE_NAME"
 
     clean
@@ -319,6 +333,7 @@ function assemble_deb() {
     # Swap configuration files
     add_configuration_files
     remove_unneeded_files
+    add_wazuh_tools
 
     # Generate final package
     local version