diff --git a/bitnami/elasticsearch/9/debian-12/Dockerfile b/bitnami/elasticsearch/9/debian-12/Dockerfile
index f78e9e42bded..75f6ab652b13 100644
--- a/bitnami/elasticsearch/9/debian-12/Dockerfile
+++ b/bitnami/elasticsearch/9/debian-12/Dockerfile
@@ -10,7 +10,7 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-06-30T17:45:36Z" \
+      org.opencontainers.image.created="2025-07-17T01:43:48Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \
@@ -32,8 +32,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "yq-4.45.4-3-linux-${OS_ARCH}-debian-12" \
-      "java-21.0.7-9-0-linux-${OS_ARCH}-debian-12" \
+      "yq-4.46.1-0-linux-${OS_ARCH}-debian-12" \
+      "java-21.0.8-12-0-linux-${OS_ARCH}-debian-12" \
       "elasticsearch-9.0.3-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/elasticsearch/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index ea80b77376c2..95fea35c9b4e 100644
--- a/bitnami/elasticsearch/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/elasticsearch/9/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,12 +9,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "21.0.7-9-0"
+        "version": "21.0.8-12-0"
     },
     "yq": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "4.45.4-3"
+        "version": "4.46.1-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/elasticsearch/9/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/9/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh
index 4c847e0a87f9..f98c42f87dfe 100644
--- a/bitnami/elasticsearch/9/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh
+++ b/bitnami/elasticsearch/9/debian-12/rootfs/opt/bitnami/scripts/libelasticsearch.sh
@@ -359,7 +359,8 @@ elasticsearch_validate() {
         if [ -n "$DB_NODE_ROLES" ]; then
             read -r -a roles_list <<<"$(get_elasticsearch_roles)"
             local master_role="master"
-            [[ "$DB_FLAVOR" = "opensearch" && "$APP_VERSION" =~ ^2\. ]] && master_role="cluster_manager"
+            local major_version="$(get_sematic_version "$(elasticsearch_get_version)" 1)"
+            [[ "$DB_FLAVOR" = "opensearch" && "$major_version" -eq 2 ]] && master_role="cluster_manager"
             if [[ "${#roles_list[@]}" -le 0 ]]; then
                 warn "Setting ${DB_FLAVOR^^}_NODE_ROLES is empty and ${DB_FLAVOR^^}_IS_DEDICATED_NODE is set to true, ${DB_FLAVOR^} will be configured as coordinating-only node."
             fi
@@ -461,10 +462,12 @@ get_elasticsearch_hostname() {
 #   Array of node roles
 #########################
 get_elasticsearch_roles() {
+    local major_version="$(get_sematic_version "$(elasticsearch_get_version)" 1)"
+
     read -r -a roles_list_tmp <<<"$(tr ',;' ' ' <<<"$DB_NODE_ROLES")"
     roles_list=("${roles_list_tmp[@]}")
     for i in "${!roles_list[@]}"; do
-        if [[ ${roles_list[$i]} == "master" ]] && [[ "$DB_FLAVOR" = "opensearch" && "$APP_VERSION" =~ ^2\. ]]; then
+        if [[ ${roles_list[$i]} == "master" ]] && [[ "$DB_FLAVOR" = "opensearch" && "$major_version" -eq 2 ]]; then
             roles_list[i]="cluster_manager"
         fi
     done
@@ -524,7 +527,8 @@ elasticsearch_cluster_configuration() {
         fi
         elasticsearch_conf_set discovery.seed_hosts "${host_list[@]}"
         if is_node_master; then
-            if [[ "$DB_FLAVOR" = "opensearch" && "$APP_VERSION" =~ ^2\. ]]; then
+            local major_version="$(get_sematic_version "$(elasticsearch_get_version)" 1)"
+            if [[ "$DB_FLAVOR" = "opensearch" && "$major_version" -eq 2 ]]; then
                 elasticsearch_conf_set cluster.initial_cluster_manager_nodes "${master_list[@]}"
             else
                 elasticsearch_conf_set cluster.initial_master_nodes "${master_list[@]}"
@@ -930,3 +934,26 @@ elasticsearch_healthcheck() {
         return 1
     fi
 }
+
+########################
+# Extract opensearch version from version string
+# Globals:
+#   DB_*
+# Arguments:
+#   None
+# Returns:
+#   Version string
+#########################
+elasticsearch_get_version() {
+    local ver_string
+    local -a ver_split
+
+    if [[ "$DB_FLAVOR" = "opensearch" ]]; then
+        ver_string=$("${DB_BIN_DIR}/opensearch" "--version" 2>/dev/null)
+    else
+        ver_string=$("${DB_BIN_DIR}/elasticsearch" "--version" 2>/dev/null)
+    fi
+
+    read -r -a ver_split <<< "$ver_string"
+    echo "${ver_split[1]::-1}"
+}
diff --git a/bitnami/elasticsearch/9/debian-12/tags-info.yaml b/bitnami/elasticsearch/9/debian-12/tags-info.yaml
deleted file mode 100644
index 131b688129ae..000000000000
--- a/bitnami/elasticsearch/9/debian-12/tags-info.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-rolling-tags:
-  - "9"
-  - 9-debian-12
-  - 9.0.3
-  - latest