diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml
index de832cbef604481074c8eb8db3cb8d18a0670864..831083cfbed6ba67b6f75adf5e7d15175c9bab27 100644
--- a/metricbeat/metricbeat.yml
+++ b/metricbeat/metricbeat.yml
@@ -34,8 +34,8 @@ metricbeat.modules:
   enabled: true
 
 # ================================== Template =================================== #
-setup.template.name: "metricbeat-${METRICBEAT_INDEX_INFIX}-%{[agent.version]}"
-setup.template.pattern: "metricbeat-${METRICBEAT_INDEX_INFIX}-%{[agent.version]}-*"
+setup.template.name: "metricbeat-${METRICBEAT_INDEX_INFIX}-v%{[agent.version]}"
+setup.template.pattern: "metricbeat-${METRICBEAT_INDEX_INFIX}-v%{[agent.version]}-*"
 
 # =================================== Outputs =================================== #
 
diff --git a/opensearch/init-security.sh b/opensearch/init-security.sh
index 371c1ca49ef38cecd4fcc4bb46003f4ee7654963..987542ff7fdfbdcc2d076f416d9ed890481e979b 100755
--- a/opensearch/init-security.sh
+++ b/opensearch/init-security.sh
@@ -14,9 +14,9 @@ admin_pw="${OPENSEARCH_ADMIN_PASSWORD:?admin password required}"
 kibanaserver_pw="${OPENSEARCH_KIBANASERVER_PASSWORD:?kibana server password required}"
 logginguser_pw="${OPENSEARCH_LOGGINGUSER_PASSWORD:?logging user password required}"
 
-admin_hash=$(${sec_plugin_path}/tools/hash.sh -p "${admin_pw}")
-dashboards_hash=$(${sec_plugin_path}/tools/hash.sh -p "${kibanaserver_pw}")
-logging_hash=$(${sec_plugin_path}/tools/hash.sh -p "${logginguser_pw}")
+admin_hash=$(${sec_plugin_path}/tools/hash.sh -p "${admin_pw}" | tr " " "\n" | tail -n 1)
+dashboards_hash=$(${sec_plugin_path}/tools/hash.sh -p "${kibanaserver_pw}" | tr " " "\n" | tail -n 1)
+logging_hash=$(${sec_plugin_path}/tools/hash.sh -p "${logginguser_pw}" | tr " " "\n" | tail -n 1)
 
 # write the passwords to 'internal_users.yml'
 # (the lines to be replaced are marked with comments)
diff --git a/scripts/generate-ssl.sh b/scripts/generate-ssl.sh
index 18c3463ca84c07d9a19feccb35f5c32e65dbe7af..1e14f06ac7ecf1bb49f877232106d7990a9b976a 100755
--- a/scripts/generate-ssl.sh
+++ b/scripts/generate-ssl.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # script for generating SSL keys and certificates