Merge pull request #2299 from wazuh/enhancement/wqa2276-bump-test_bump_main_with_set-as-main_true

Bump test_bump_main_with_set-as-main_true branch
feat: bump test_bump_main_with_set-as-main_true
2026-04-14 22:15:31 +02:00 · 2026-04-14 20:15:27 +00:00
50 changed files with 941 additions and 797 deletions
@@ -1,4 +1,3 @@
-WAZUH_VERSION=5.0.0
-WAZUH_IMAGE_VERSION=5.0.0
+WAZUH_VERSION=5.1.0
+WAZUH_IMAGE_VERSION=5.1.0
 WAZUH_REGISTRY=docker.io
-IMAGE_TAG=5.0.0
@@ -32,11 +32,7 @@ on:
        description: 'Optional identifier for the run'
        required: false
        type: string
-      revert:
-        description: 'Set to true to revert the bump changes applied for this issue'
-        default: false
-        required: false
-        type: boolean
+
 jobs:
  bump:
    name: Repository bumper 5.x
@@ -111,14 +107,7 @@ jobs:
          fi

          issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
-
-          if [[ "${{ inputs.revert }}" == "true" ]]; then
-            BRANCH_NAME="enhancement/wqa${issue_number}-revert-bump-${{ github.ref_name }}"
-            echo "pr_title=Revert bump ${{ github.ref_name }} branch" >> $GITHUB_OUTPUT
-          else
-            BRANCH_NAME="enhancement/wqa${issue_number}-bump-${{ github.ref_name }}"
-            echo "pr_title=Bump ${{ github.ref_name }} branch" >> $GITHUB_OUTPUT
-          fi
+          BRANCH_NAME="enhancement/wqa${issue_number}-bump-${{ github.ref_name }}"
          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
          echo "script_params=${script_params}" >> $GITHUB_OUTPUT

@@ -127,68 +116,22 @@ jobs:
          git checkout -b ${{ steps.vars.outputs.branch_name }}

      - name: Make version bump changes
-        if: inputs.revert != true
        run: |
          echo "Running bump script"
          bash ${{ env.BUMP_SCRIPT_PATH }} ${{ steps.vars.outputs.script_params }}

-      - name: Commit changes (Bump)
-        if: inputs.revert != true
+      - name: Commit and push changes
        run: |
          git add .
          git commit -m "feat: bump ${{ github.ref_name }}"
-
-      - name: Fetch full history (Revert)
-        if: inputs.revert == true
-        run: git fetch --unshallow
-
-      - name: Revert references (Revert)
-        id: revert_step
-        if: inputs.revert == true
-        run: |
-          ISSUE_NUMBER=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
-
-          BUMP_BRANCH="enhancement/wqa${ISSUE_NUMBER}-bump-${{ github.ref_name }}"
-
-          PR_NUMBER=$(gh pr list --head "$BUMP_BRANCH" --base "${{ github.ref_name }}" --state merged --json number --jq '.[0].number')
-
-          if [ -z "$PR_NUMBER" ] || [ "$PR_NUMBER" == "null" ]; then
-            echo "Error: The original PR for the bump was not found"
-            echo "Searching merged PR from: $BUMP_BRANCH to ${{ github.ref_name }}"
-            exit 1
-          fi
-
-          echo "Original PR found: #$PR_NUMBER"
-
-          MERGE_COMMIT=$(gh pr view $PR_NUMBER --json mergeCommit --jq '.mergeCommit.oid')
-
-          git revert -m 1 $MERGE_COMMIT --no-commit
-
-          # Remove the files to prevent them from being included in the revert commit
-          git checkout HEAD -- VERSION.json 2>/dev/null || true
-          git checkout HEAD -- CHANGELOG.md 2>/dev/null || true
-          # Add any other repository-specific version files here
-
-          if git diff --staged --quiet; then
-            echo "No references to revert. Skipping commit."
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          else
-            git commit -m "feat: revert ${{ github.ref_name }} references"
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Push changes
-        if: inputs.revert != true || (inputs.revert == true && steps.revert_step.outputs.has_changes == 'true')
-        run: |
          git push origin ${{ steps.vars.outputs.branch_name }}

      - name: Create pull request
        id: create_pr
-        if: inputs.revert != true || (inputs.revert == true && steps.revert_step.outputs.has_changes == 'true')
        run: |
          gh auth setup-git
          PR_URL=$(gh pr create \
-            --title "${{ steps.vars.outputs.pr_title }}" \
+            --title "Bump ${{ github.ref_name }} branch" \
            --body "Issue: ${{ inputs.issue-link }}" \
            --base ${{ github.ref_name }} \
            --head ${{ steps.vars.outputs.branch_name }})
@@ -197,25 +140,14 @@ jobs:
          echo "pull_request_url=${PR_URL}" >> $GITHUB_OUTPUT

      - name: Merge pull request
-        if: inputs.revert != true || (inputs.revert == true && steps.revert_step.outputs.has_changes == 'true')
        run: |
-          # Any checks for the PR are bypassed since the branch is expected to be functional
+          # Any checks for the PR are bypassed since the branch is expected to be functional (i.e. the bump process does not introduce any bugs)
          gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge --admin

      - name: Show logs
-        if: inputs.revert != true
        run: |
          echo "Bump complete."
          echo "Branch: ${{ steps.vars.outputs.branch_name }}"
          echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
          echo "Bumper scripts logs:"
-          cat ${BUMP_LOG_PATH}/repository_bumper*log
-
-      - name: Show revert logs
-        if: inputs.revert == true
-        run: |
-          echo "Revert bump complete."
-          echo "Branch: ${{ steps.vars.outputs.branch_name }}"
-          echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
-          echo "Revert bumper scripts logs:"
-          cat ${BUMP_LOG_PATH}/repository_bumper*log || true
+          cat ${BUMP_LOG_PATH}/repository_bumper*log
@@ -4,7 +4,6 @@ permissions:
  id-token: write
 on:
  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
  workflow_dispatch:
    inputs:
      docker_reference:
@@ -15,7 +14,6 @@ on:
 jobs:

  prepare-variables:
-    if: ${{ !github.event.pull_request.draft }}
    runs-on: ubuntu-latest
    outputs:
      WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }}
@@ -78,7 +76,7 @@ jobs:
      uses: aws-actions/amazon-ecr-login@v2

    - name: Execute Goss tests (wazuh-manager)
-      run: dgoss run ${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-manager:${{ env.WAZUH_IMAGE_VERSION }}-latest
+      run: dgoss run ${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-manager:${{ env.WAZUH_IMAGE_VERSION }}
      env:
        GOSS_SLEEP: 30
        GOSS_FILE: .github/.goss.yaml
@@ -90,7 +88,7 @@ jobs:
      matrix:
        os: [ubuntu-22.04, ubuntu-22.04-arm]
      fail-fast: false
-    needs: [prepare-variables, Execute-Goss-tests]
+    needs: [prepare-variables, Execute-Goss-tests, build-images]
    env:
      WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
      WAZUH_MINOR_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_MINOR_VERSION }}
@@ -164,7 +162,6 @@ jobs:
        if [ -f "$TARGET_FILE" ]; then
          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
        else
          echo "File $TARGET_FILE not found"
          exit 1
@@ -287,7 +284,6 @@ jobs:
        if [ -f "$TARGET_FILE" ]; then
          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
        else
          echo "File $TARGET_FILE not found"
          exit 1
@@ -365,7 +361,7 @@ jobs:
      matrix:
        os: [ubuntu-22.04, ubuntu-22.04-arm]
      fail-fast: false
-    needs: [prepare-variables, Execute-Goss-tests]
+    needs: [prepare-variables, Execute-Goss-tests, build-images]
    env:
      WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
      WAZUH_MINOR_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_MINOR_VERSION }}
@@ -445,7 +441,6 @@ jobs:
        if [ -f "$TARGET_FILE" ]; then
          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
        else
          echo "File $TARGET_FILE not found"
          exit 1
@@ -578,7 +573,6 @@ jobs:
        if [ -f "$TARGET_FILE" ]; then
          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
        else
          echo "File $TARGET_FILE not found"
          exit 1
@@ -6,7 +6,7 @@ on:
    inputs:
      image_tag:
        description: 'Docker image tag'
-        default: '5.0.0'
+        default: '5.1.0'
        required: true
      docker_reference:
        description: 'wazuh-docker reference'
@@ -42,7 +42,7 @@ on:
    inputs:
      image_tag:
        description: 'Docker image tag'
-        default: '5.0.0'
+        default: '5.1.0'
        required: true
        type: string
      docker_reference:
@@ -90,7 +90,6 @@ jobs:
    outputs:
      WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
      COMMIT_LIST: ${{ steps.compute-outputs.outputs.COMMIT_LIST }}
-      ALL_PRODUCTS_SELECTED: ${{ steps.compute-outputs.outputs.ALL_PRODUCTS_SELECTED }}

    steps:
    - name: Print inputs
@@ -116,22 +115,24 @@ jobs:
    - name: Set up variables
      id: compute-outputs
      run: |
-        # Use the default list if products is empty
-        PRODUCTS="${{ inputs.products }}"
-        if [[ -z "$PRODUCTS" || "$PRODUCTS" == "null" ]]; then
-          PRODUCTS="wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent"
-        fi
-        # Check if all 4 core components are present in the string
-        if [[ "$PRODUCTS" == *"wazuh-manager"* && "$PRODUCTS" == *"wazuh-dashboard"* && "$PRODUCTS" == *"wazuh-indexer"* && "$PRODUCTS" == *"wazuh-agent"* ]]; then
-          echo "ALL_PRODUCTS_SELECTED=true" >> $GITHUB_OUTPUT
-        else
-          echo "ALL_PRODUCTS_SELECTED=false" >> $GITHUB_OUTPUT
-        fi
        # Set WAZUH_COMPONENTS
-        # Convert to JSON for the matrix (Your existing logic)
-        IFS=',' read -ra COMPONENTS <<< "$PRODUCTS"
-        JSON_ARRAY=$(printf '%s\n' "${COMPONENTS[@]}" | jq -R . | jq -s -c .)
-        echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
+        WC_JSON_ARRAY=""
+        if [[ "${{ inputs.products }}" != "null" && "${{ inputs.products }}" != "" ]]; then
+          # Convert comma-separated list to JSON array format
+          IFS=',' read -ra COMPONENTS <<< "${{ inputs.products }}"
+          WC_JSON_ARRAY="["
+          for i in "${!COMPONENTS[@]}"; do
+            if [ $i -gt 0 ]; then
+              WC_JSON_ARRAY+=","
+            fi
+            WC_JSON_ARRAY+="\"${COMPONENTS[$i]}\""
+          done
+          WC_JSON_ARRAY+="]"
+        else
+          WC_JSON_ARRAY='["wazuh-manager","wazuh-dashboard","wazuh-indexer","wazuh-agent"]'
+        fi
+        echo "Products to build: $WC_JSON_ARRAY"
+        echo "WAZUH_COMPONENTS=$WC_JSON_ARRAY" >> $GITHUB_OUTPUT

        # Set COMMIT_LIST
        WC_COMMIT_LIST=""
@@ -233,11 +234,6 @@ jobs:
          source ${{ env.WORKFLOW_VENV }}/bin/activate
          WAZUH_COMPONENTS='${{ needs.setup.outputs.WAZUH_COMPONENTS }}'
          COMMIT_LIST='${{ needs.setup.outputs.COMMIT_LIST }}'
-          SCRIPT_PARAMS="--process ${{ env.PRESIGNED_URLS_SCRIPT_PROCESS }} \
-                            --wazuh-version ${{ env.WAZUH_VERSION }} \
-                            --aws-s3-bucket-dev ${{ env.LOCAL_AWS_S3_BUCKET_DEV }} \
-                            --assistant-revision $ASSISTANT_REVISION "
-

          # Parse components and their revisions
          COMPONENTS=($(echo "$WAZUH_COMPONENTS" | jq -r '.[]'))
@@ -256,22 +252,29 @@ jobs:
          for i in "${!COMPONENTS[@]}"; do
          case "${COMPONENTS[$i]}" in
            wazuh-manager)
-            SCRIPT_PARAMS+="--manager-revision ${REVISIONS[$i]} "
+            MANAGER_REVISION="${REVISIONS[$i]}"
            ;;
            wazuh-dashboard)
-            SCRIPT_PARAMS+="--dashboard-revision ${REVISIONS[$i]} "
+            DASHBOARD_REVISION="${REVISIONS[$i]}"
            ;;
            wazuh-indexer)
-            SCRIPT_PARAMS+="--indexer-revision ${REVISIONS[$i]} "
+            INDEXER_REVISION="${REVISIONS[$i]}"
            ;;
            wazuh-agent)
-            SCRIPT_PARAMS+="--agent-revision ${REVISIONS[$i]} "
+            AGENT_REVISION="${REVISIONS[$i]}"
            ;;
          esac
          done

          python ${{ env.GENERATE_PRESIGNED_URLS_SCRIPT_PATH }} \
-              $SCRIPT_PARAMS
+              --process ${{ env.PRESIGNED_URLS_SCRIPT_PROCESS }} \
+              --wazuh-version ${{ env.WAZUH_VERSION }} \
+              --aws-s3-bucket-dev ${{ env.LOCAL_AWS_S3_BUCKET_DEV }} \
+              --indexer-revision   $INDEXER_REVISION \
+              --manager-revision   $MANAGER_REVISION \
+              --dashboard-revision $DASHBOARD_REVISION \
+              --agent-revision     $AGENT_REVISION \
+              --assistant-revision $ASSISTANT_REVISION

      - name: Save presigned URLs file to artifact
        if: ${{ inputs.dev == true }}
@@ -363,7 +366,6 @@ jobs:
              -d $DEV_STAGE \
              -rg $IMAGE_REGISTRY \
              -m \
-              --dev \
              -refs "$COMPONENT_REFS_JSON" \
              -c ${{ matrix.wazuh_component }}
          else
@@ -380,7 +382,6 @@ jobs:
              -v $IMAGE_TAG \
              -rg $IMAGE_REGISTRY \
              -m \
-              --dev \
              -refs "$COMPONENT_REFS_JSON" \
              -c ${{ matrix.wazuh_component }}
          else
@@ -404,19 +405,11 @@ jobs:
        fi
      working-directory: ./build-docker-images

-
-  notify:
-    runs-on: ubuntu-22.04
-    needs: [setup, build-and-push]
-    # Only run if NOT dev AND all products were selected
-    if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
-
-    steps:
    - name: Image exists validation
+      if: ${{ inputs.dev == false }}
      id: validation
      run: |
        IMAGE_TAG=${{ inputs.image_tag }}
-        IMAGE_REGISTRY="${{ vars.IMAGE_REGISTRY_PROD }}"
        PURPOSE=""

        if [[ "$IMAGE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -438,15 +431,12 @@ jobs:
        echo "purpose=$PURPOSE" >> $GITHUB_OUTPUT

    - name: GH issue notification
-      if: ${{ steps.validation.outputs.purpose != '' }}
-      env:
-        GH_TOKEN: ${{ secrets.NOTIFICATION_GH_ARTIFACT_TOKEN }}
+      if: ${{ inputs.dev == false && steps.validation.outputs.purpose != '' }}
      run: |
        IMAGE_TAG=${{ inputs.image_tag }}
-        PURPOSE="${{ steps.validation.outputs.purpose }}"
-
        GH_TITLE=""
        GH_MESSAGE=""
+        PURPOSE="${{ steps.validation.outputs.purpose }}"

        ## Setting GH issue title
        GH_TITLE="Artifactory vulnerabilities update \`v$IMAGE_TAG\`"
@@ -497,3 +487,6 @@ jobs:
          gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_SIZE_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_SIZE_OPTION_ID }}
          ## Setting Subteam
          gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_SUBTEAM_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_SUBTEAM_OPTION_ID }}
+
+      env:
+        GH_TOKEN: ${{ secrets.NOTIFICATION_GH_ARTIFACT_TOKEN }}
@@ -1,32 +0,0 @@
-name: PR Check - Docker Integration Tests
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr_head_ref:
-        description: 'Branch of wazuh-docker to test'
-        required: true
-        type: string
-      automation_reference:
-        description: 'Branch of wazuh-automation to use'
-        required: false
-        default: 'main'
-        type: string
-      deployment_type:
-        description: 'Deployment type to test'
-        required: true
-        type: choice
-        options:
-          - single-node
-          - multi-node
-          - both
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  placeholder:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "Workflow registered. Use workflow_dispatch selecting the feature branch."
@@ -12,7 +12,7 @@ multi-node/wazuh-certificates/*
 multi-node/wazuh-certificates-tool.log
 multi-node/wazuh-certs-tool*.sh
 multi-node/config*.yml
-multi-node/config/*/certs
+multi-node/config/wazuh*

 # Documentation
 docs/book/
@@ -1,22 +1,33 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [5.1.0]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [5.0.0]

 ### Added

- Add revert option into bumper workflow ([#2330](https://github.com/wazuh/wazuh-docker/pull/2330))
- Add checks for artifact_urls.yaml download ([#2315](https://github.com/wazuh/wazuh-docker/pull/2315))
- Add set_as_main option ([#2293](https://github.com/wazuh/wazuh-docker/pull/2293))
+- None

 ### Changed

- Forbid pr_check workflow execution in draft PRs ([#2399](https://github.com/wazuh/wazuh-docker/pull/2399))
- Unification of user UID and GID ([#2393](https://github.com/wazuh/wazuh-docker/pull/2393))
- Add Wazuh indexer engine start on entrypoint ([#2390](https://github.com/wazuh/wazuh-docker/pull/2390))
- Image build process update ([#2358](https://github.com/wazuh/wazuh-docker/pull/2358))
- Add new path on artifact_urls file ([#2344](https://github.com/wazuh/wazuh-docker/pull/2344))
- Presigned URLs generation enhancement ([#2346](https://github.com/wazuh/wazuh-docker/pull/2346))
+- Add set_as_main option ([#2293](https://github.com/wazuh/wazuh-docker/pull/2293))
 - Adapt bumper workflows to change main branch ([#2294](https://github.com/wazuh/wazuh-docker/pull/2294))
 - Delete all API user and password references and Wazuh agent references ([#2289](https://github.com/wazuh/wazuh-docker/pull/2289))
 - Create certificate directory with default user and group ([#2287](https://github.com/wazuh/wazuh-docker/pull/2287))
@@ -55,10 +66,6 @@ All notable changes to this project will be documented in this file.

 ### Fixed

- Adapt Wazuh manager healthcheck with local binaries ([#2422](https://github.com/wazuh/wazuh-docker/pull/2422))
- Delete setcap command on deprecated file ([#2345](https://github.com/wazuh/wazuh-docker/pull/2345))
- Modify the choice of a correct tag ([#2313](https://github.com/wazuh/wazuh-docker/pull/2313))
- Artifact URL download fix ([#2306](https://github.com/wazuh/wazuh-docker/pull/2306))
 - Change API query method. ([#2275](https://github.com/wazuh/wazuh-docker/pull/2275))
 - Change Wazuh manager Healthcheck. ([#2272](https://github.com/wazuh/wazuh-docker/pull/2272))
 - Delete WAZUH_AGENT_GROUP variable. ([#2263](https://github.com/wazuh/wazuh-docker/pull/2263))
@@ -68,43 +75,6 @@ All notable changes to this project will be documented in this file.

 - None

-## [4.14.7]
-
-### Added
-
- None
-
-### Changed
-
- None
-
-### Fixed
-
- None
-
-### Deleted
-
- None
-
-## [4.14.6]
-
-### Added
-
- None
-
-### Changed
-
- None
-
-### Fixed
-
- Changed update_user function from wazuh.security to wazuh.rbac.orm module ([#2406](https://github.com/wazuh/wazuh-docker/pull/2406))
- GH issue notification fix ([#2312](https://github.com/wazuh/wazuh-docker/pull/2312))
-
-### Deleted
-
- None
-
 ## [4.14.5]

 ### Added
@@ -18,7 +18,7 @@ The `wazuh/wazuh-docker` repository provides resources to deploy the Wazuh cyber
 ## Branch Convention

 - `main`: Developing and testing of new features.
- `X.Y.Z`: Version-specific branches (e.g., `5.0.0`, `4.14.0`, etc.).
+- `X.Y.Z`: Version-specific branches (e.g., `5.1.0`, `4.14.0`, etc.).

 ## Documentation

@@ -1,4 +1,4 @@
 {
-    "version": "5.0.0",
-    "stage": "beta2"
-}
+    "version": "5.1.0",
+    "stage": "alpha0"
+}
@@ -8,16 +8,15 @@
 # License (version 2) as published by the FSF - Free Software
 # Foundation.

-WAZUH_IMAGE_VERSION=5.0.0
-IMAGE_TAG=5.0.0
+WAZUH_IMAGE_VERSION=5.1.0
+IMAGE_TAG=5.1.0
 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
 IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
 WAZUH_REGISTRY=docker.io

-WAZUH_IMAGE_VERSION="5.0.0"
+WAZUH_IMAGE_VERSION="5.1.0"
 WAZUH_DEV_STAGE=""
 WAZUH_COMPONENTS_COMMIT_LIST=''
-IS_DEV_BUILD=""

 # -----------------------------------------------------------------------------

@@ -38,79 +37,50 @@ ctrl_c() {

 build() {

-    # WAZUH_MINOR_VERSION: Extracts major and minor version only (e.g., 5.0.0 -> 5.0)
+    # WAZUH_MINOR_VERSION: Extracts major and minor version only (e.g., 5.1.0 -> 5.0)
    WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}"
-    # WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.0.0 -> 5)
+    # WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.1.0 -> 5)
    WAZUH_MAJOR_VERSION="${WAZUH_IMAGE_VERSION%%.*}"
    # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta1, rc2) from the local JSON metadata file.
    # Note: This is primarily used for pre-release package naming.
    WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json)
    # ARTIFACT_URLS_FILE: The name of the artifact URLs file.
    ARTIFACT_URLS_FILE="artifact_urls.yaml"
-    # ARTIFACT_URLS_DIR: The name of the artifact URLs directory.
-    ARTIFACT_URLS_DIR="artifact-urls"

    # Check if the artifact file already exists to prevent redundant downloads
    if [[ -f "$ARTIFACT_URLS_FILE" ]]; then
        echo "$ARTIFACT_URLS_FILE exists. Using existing file."
    else
-        # GitHub URL for exact Release Tag lookup
+        # Prepare logic to fetch the artifact from Wazuh's infrastructure
        TAG="v${WAZUH_IMAGE_VERSION}"
        REPO="wazuh/wazuh-docker"
-        GH_URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
+        GH_URL="https://api.github.com/repos/${REPO}/git/refs/tags/${TAG}"

-        # Fetch the HTTP status code to determine release environment.
-        # Using -L to follow redirects (GitHub may return 301/302 for some endpoints).
-        HTTP_STATUS=$(curl -sL -o /dev/null -w "%{http_code}" "$GH_URL")
-
-        if [ "$HTTP_STATUS" -eq 200 ]; then
-            # CASE: Production (Tag and Release exist)
-            echo "Release $TAG found. Setting Production environment."
-            ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml"
-            PACKAGE_URL="packages.wazuh.com"
-            RELEASE_STAGE="production"
-        elif [ "$HTTP_STATUS" -eq 403 ]; then
-            # CASE: GitHub API rate limit hit — fall back to pre-release to avoid
-            # incorrectly skipping staging artifacts.
-            echo "Warning: GitHub API rate limit reached (403). Assuming pre-release environment." >&2
-            PACKAGE_URL="packages-staging.xdrsiem.wazuh.info"
-            RELEASE_STAGE="pre-release"
-            if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml"
-            else
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml"
-            fi
+        # Use GitHub API to check if the tag exists publicly.
+        # This determines if we should look for production or staging artifacts.
+        if curl -fsSL "$GH_URL" >/dev/null 2>&1; then
+            # CASE: Production (Tag exists in the official repository)
+            ARTIFACT_URLS_DOWNLOAD=artifact_urls_${WAZUH_IMAGE_VERSION}.yaml
+            PACKAGE_URL=packages.wazuh.com
+            RELEASE_STAGE=production
        else
-            # CASE: Pre-release/Staging (404 Not Found or any other non-200 status)
-            echo "Release $TAG not found (HTTP status: $HTTP_STATUS). Setting Pre-release environment."
-            PACKAGE_URL="packages-staging.xdrsiem.wazuh.info"
-            RELEASE_STAGE="pre-release"
-            if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml"
-            else
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml"
-            fi
+            # CASE: Pre-release/Staging (Tag not found, fall back to staging environment)
+            # Includes the WAZUH_STAGE suffix (e.g., artifact_urls_5.0.0-alpha0.yaml)
+            ARTIFACT_URLS_DOWNLOAD=artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml
+            PACKAGE_URL=packages-staging.xdrsiem.wazuh.info
+            RELEASE_STAGE=pre-release
        fi
-
        # Final download using dynamic variables based on the release type.
        # Pattern: server / stage / major_version.x / filename
-        FULL_URL="https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DIR}/${ARTIFACT_URLS_DOWNLOAD}"
-        echo "Attempting to download: $FULL_URL"
-        curl -fsSL -o "$ARTIFACT_URLS_FILE" "$FULL_URL" || {
-            echo "Error: Failed to download artifact URLs from $FULL_URL" >&2
-            clean 1
-        }
+        curl -fsSL -o "$ARTIFACT_URLS_FILE" "https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DOWNLOAD}"
    fi

    awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=\"" val "\""}' $ARTIFACT_URLS_FILE > artifacts_env.txt

-    # Set component commit references for development builds.
-    # Commits are only resolved (and later appended to the image tag) when --dev is
-    # explicitly passed. Production and stage builds (dev=false) never include a
-    # commit suffix even if -refs is provided. Manual local builds also omit it.
-    if [ -n "${IS_DEV_BUILD}" ]; then
+    # Set component commit references for development builds
+    if [ -n "${WAZUH_DEV_STAGE}" ]; then
        if [ -z "${WAZUH_COMPONENTS_COMMIT_LIST}" ]; then
-            # Default to 'latest' for all components if no specific references are provided
+            # Set default to 'latest' for all components if no specific references are provided
            INDEXER_COMMIT="latest"
            MANAGER_COMMIT="latest"
            DASHBOARD_COMMIT="latest"
@@ -131,6 +101,7 @@ build() {
                fi

                # Set all component commits
+
                INDEXER_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[0]')"
                MANAGER_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[1]')"
                DASHBOARD_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[2]')"
@@ -166,23 +137,52 @@ build() {
    fi


-    # Write the global .env file used by deployment compose files.
-    # IMAGE_TAG here reflects a non-dev, non-per-component tag for reference.
-    local base_tag="${WAZUH_IMAGE_VERSION}${WAZUH_DEV_STAGE:+-${WAZUH_DEV_STAGE,,}}"
+    # Function to get component-specific commit reference
+    get_component_commit() {
+        local component=$1
+        case "${component}" in
+            wazuh-indexer)
+                echo "${INDEXER_COMMIT}"
+                ;;
+            wazuh-manager)
+                echo "${MANAGER_COMMIT}"
+                ;;
+            wazuh-dashboard)
+                echo "${DASHBOARD_COMMIT}"
+                ;;
+            wazuh-agent)
+                echo "${AGENT_COMMIT}"
+                ;;
+            *)
+                echo ""
+                ;;
+        esac
+    }
+
+    # Global env file (without IMAGE_TAG - will be component-specific)
    echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > ../.env
    echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> ../.env
    echo WAZUH_REGISTRY=$WAZUH_REGISTRY >> ../.env
-    echo IMAGE_TAG=${base_tag} >> ../.env

    set -a
    source ../.env
    source ./artifacts_env.txt
    set +a

-    # Validate component if a specific one was requested.
-    if [ -n "${WAZUH_COMPONENT}" ]; then
+    # Define all available components
+    local all_components=("wazuh-indexer" "wazuh-manager" "wazuh-dashboard" "wazuh-agent")
+    local components_to_build=()
+
+    # Determine which components to build
+    if [ -z "${WAZUH_COMPONENT}" ]; then
+        echo "No component specified. Building all components..."
+        components_to_build=("${all_components[@]}")
+    else
+        # Validate component
        case "${WAZUH_COMPONENT}" in
-            wazuh-indexer|wazuh-manager|wazuh-dashboard|wazuh-agent) ;;
+            wazuh-indexer|wazuh-manager|wazuh-dashboard|wazuh-agent)
+                components_to_build=("${WAZUH_COMPONENT}")
+                ;;
            *)
                echo "Error: Unknown component '${WAZUH_COMPONENT}'" >&2
                clean 1
@@ -190,51 +190,67 @@ build() {
        esac
    fi

-    # Generate per-component image tags.
-    # The commit suffix is only appended when --dev is passed. This ensures:
-    #   dev=false, tag=5.0.0       → 5.0.0
-    #   dev=false, tag=5.0.0-beta1 → 5.0.0-beta1
-    #   dev=true,  tag=5.0.0       → 5.0.0-latest
-    #   dev=true,  tag=5.0.0-beta1 → 5.0.0-beta1-latest
-    make_tag() {
-        local commit=$1
-        if [ -n "${IS_DEV_BUILD}" ]; then
-            echo "${WAZUH_IMAGE_VERSION}${WAZUH_DEV_STAGE:+-${WAZUH_DEV_STAGE,,}}-${commit}"
-        else
-            echo "${base_tag}"
-        fi
-    }
-
-    export WAZUH_VERSION="$WAZUH_IMAGE_VERSION"
-    export MULTIARCH="${MULTIARCH}"
-    export INDEXER_TAG=$(make_tag   "${INDEXER_COMMIT:-latest}")
-    export MANAGER_TAG=$(make_tag   "${MANAGER_COMMIT:-latest}")
-    export DASHBOARD_TAG=$(make_tag "${DASHBOARD_COMMIT:-latest}")
-    export AGENT_TAG=$(make_tag     "${AGENT_COMMIT:-latest}")
-
-    echo "Image tags:"
-    echo "  wazuh-indexer:   ${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${INDEXER_TAG}"
-    echo "  wazuh-manager:   ${WAZUH_REGISTRY}/wazuh/wazuh-manager:${MANAGER_TAG}"
-    echo "  wazuh-dashboard: ${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${DASHBOARD_TAG}"
-    echo "  wazuh-agent:     ${WAZUH_REGISTRY}/wazuh/wazuh-agent:${AGENT_TAG}"
-
-    # Bake options: --push for multi-arch (can't load multi-platform locally),
-    # --load for single-arch (stores image in local Docker daemon).
-    local bake_opts="--no-cache"
+    # Determine build command and base options
    if [ "${MULTIARCH}" ]; then
-        bake_opts="${bake_opts} --push"
+        build_cmd="docker buildx build --platform linux/amd64,linux/arm64 --push --no-cache"
    else
-        bake_opts="${bake_opts} --load"
+        build_cmd="docker build --no-cache"
    fi

-    # Build a specific component or the full default group (all 4 in parallel).
-    if [ -z "${WAZUH_COMPONENT}" ]; then
-        echo "Building all components in parallel..."
-        docker buildx bake ${bake_opts} -f docker-bake.hcl || clean 1
-    else
-        echo "Building ${WAZUH_COMPONENT}..."
-        docker buildx bake ${bake_opts} -f docker-bake.hcl "${WAZUH_COMPONENT}" || clean 1
-    fi
+    # Build each component
+    for component in "${components_to_build[@]}"; do
+        echo "Building ${component} image..."
+
+        # Get component-specific commit reference
+        COMPONENT_COMMIT=$(get_component_commit "${component}")
+
+        # Generate component-specific IMAGE_TAG
+        IMAGE_TAG="${WAZUH_IMAGE_VERSION}${WAZUH_DEV_STAGE:+-${WAZUH_DEV_STAGE,,}-${COMPONENT_COMMIT}}"
+        echo "Using IMAGE_TAG: ${IMAGE_TAG} for ${component}"
+        export IMAGE_TAG="$IMAGE_TAG"
+
+        # Build common args (used by all components)
+        build_args=(
+            -t "${WAZUH_REGISTRY}/wazuh/${component}:${IMAGE_TAG}"
+            --build-arg WAZUH_VERSION="${WAZUH_IMAGE_VERSION}"
+        )
+
+        # Add component-specific args
+        case "${component}" in
+            wazuh-indexer)
+                build_args+=(
+                    --build-arg wazuh_indexer_x86_64_rpm="${wazuh_indexer_x86_64_rpm}"
+                    --build-arg wazuh_indexer_aarch64_rpm="${wazuh_indexer_aarch64_rpm}"
+                    --build-arg wazuh_certs_tool="${wazuh_certs_tool}"
+                    --build-arg wazuh_config_yml="${wazuh_config_yml}"
+                )
+                ;;
+            wazuh-manager)
+                build_args+=(
+                    --build-arg wazuh_manager_x86_64_rpm="${wazuh_manager_x86_64_rpm}"
+                    --build-arg wazuh_manager_aarch64_rpm="${wazuh_manager_aarch64_rpm}"
+                )
+                ;;
+            wazuh-dashboard)
+                build_args+=(
+                    --build-arg wazuh_dashboard_x86_64_rpm="${wazuh_dashboard_x86_64_rpm}"
+                    --build-arg wazuh_dashboard_aarch64_rpm="${wazuh_dashboard_aarch64_rpm}"
+                    --build-arg wazuh_certs_tool="${wazuh_certs_tool}"
+                    --build-arg wazuh_config_yml="${wazuh_config_yml}"
+                )
+                ;;
+            wazuh-agent)
+                build_args+=(
+                    --build-arg wazuh_agent_x86_64_rpm="${wazuh_agent_x86_64_rpm}"
+                    --build-arg wazuh_agent_aarch64_rpm="${wazuh_agent_aarch64_rpm}"
+                )
+                ;;
+        esac
+
+        # Execute build
+        $build_cmd "${build_args[@]}" ${component}/ || clean 1
+        echo "${component} image built successfully!"
+    done

    echo ""
    echo "Image build process completed!"
@@ -248,9 +264,8 @@ help() {
    echo
    echo "Usage: $0 [OPTIONS]"
    echo
-    echo "    -d, --dev-stage <ref>        [Optional] Set the pre-release stage suffix (e.g. beta1, rc2). Not used by default."
-    echo "    --dev                        [Optional] Mark as a development build: appends the commit ref to the image tag. Controlled by inputs.dev in the workflow."
-    echo "    -refs, --references <refs>   [Optional] [Only with --dev] JSON array of commit refs for components (indexer, manager, dashboard, agent) in order. Defaults to 'latest'."
+    echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default."
+    echo "    -refs, --references <refs>   [Optional] [Only for Dev] JSON array of commit refs for components to be build (indexer, manager, dashboard, agent) in order. Defaults to latest."
    echo "    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images."
    echo "    -c, --component <comp>       [Required] Set the Wazuh component to build. Accepted values: 'wazuh-indexer', 'wazuh-manager', 'wazuh-dashboard', 'wazuh-agent'."
    echo "    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."
@@ -269,7 +284,7 @@ main() {
        "-h"|"--help")
            help 0
            ;;
-        "-d"|"--dev-stage")
+        "-d"|"--dev")
            if [ -n "${2}" ]; then
                WAZUH_DEV_STAGE="${2}"
                shift 2
@@ -277,10 +292,6 @@ main() {
                help 1
            fi
            ;;
-        "--dev")
-            IS_DEV_BUILD="true"
-            shift
-            ;;
        "-m"|"--multiarch")
            MULTIARCH="true"
                shift
@@ -0,0 +1,98 @@
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+services:
+  wazuh.manager:
+    build:
+      context: wazuh-manager/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        wazuh_manager_x86_64_rpm: ${wazuh_manager_x86_64_rpm}
+        wazuh_manager_aarch64_rpm: ${wazuh_manager_aarch64_rpm}
+        wazuh_certs_tool: ${wazuh_certs_tool}
+        wazuh_config_yml: ${wazuh_config_yml}
+    image: ${WAZUH_REGISTRY}/wazuh/wazuh-manager:${IMAGE_TAG}
+    hostname: wazuh.manager
+    restart: always
+    ports:
+      - "1514:1514"
+      - "1515:1515"
+      - "514:514/udp"
+      - "55000:55000"
+    environment:
+      - INDEXER_URL=https://wazuh.indexer:9200
+      - INDEXER_USERNAME=admin
+      - INDEXER_PASSWORD=admin
+    volumes:
+      - wazuh_api_configuration:/var/wazuh-manager/api/configuration
+      - wazuh_etc:/var/wazuh-manager/etc
+      - wazuh_logs:/var/wazuh-manager/logs
+      - wazuh_queue:/var/wazuh-manager/queue
+      - wazuh_var_multigroups:/var/wazuh-manager/var/multigroups
+
+  wazuh.agent:
+    build:
+      context: wazuh-agent/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        wazuh_agent_x86_64_rpm: ${wazuh_agent_x86_64_rpm}
+        wazuh_agent_aarch64_rpm: ${wazuh_agent_aarch64_rpm}
+    image: ${WAZUH_REGISTRY}/wazuh/wazuh-agent:${IMAGE_TAG}
+    hostname: wazuh.agent
+    restart: always
+
+  wazuh.indexer:
+    build:
+      context: wazuh-indexer/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        wazuh_indexer_x86_64_rpm: ${wazuh_indexer_x86_64_rpm}
+        wazuh_indexer_aarch64_rpm: ${wazuh_indexer_aarch64_rpm}
+        wazuh_certs_tool: ${wazuh_certs_tool}
+        wazuh_config_yml: ${wazuh_config_yml}
+    image: ${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${IMAGE_TAG}
+    hostname: wazuh.indexer
+    restart: always
+    ports:
+      - "9200:9200"
+    environment:
+      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+
+  wazuh.dashboard:
+    build:
+      context: wazuh-dashboard/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        wazuh_dashboard_x86_64_rpm: ${wazuh_dashboard_x86_64_rpm}
+        wazuh_dashboard_aarch64_rpm: ${wazuh_dashboard_aarch64_rpm}
+        wazuh_certs_tool: ${wazuh_certs_tool}
+        wazuh_config_yml: ${wazuh_config_yml}
+    image: ${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${IMAGE_TAG}
+    hostname: wazuh.dashboard
+    restart: always
+    ports:
+      - 443:443
+    environment:
+      - INDEXER_USERNAME=admin
+      - INDEXER_PASSWORD=admin
+      - SERVER_SSL_ENABLED=false
+      - WAZUH_API_URL=https://wazuh.manager
+    depends_on:
+      - wazuh.indexer
+    links:
+      - wazuh.indexer:wazuh.indexer
+      - wazuh.manager:wazuh.manager
+
+volumes:
+  wazuh_api_configuration:
+  wazuh_etc:
+  wazuh_logs:
+  wazuh_queue:
+  wazuh_var_multigroups:
+  wazuh_active_response:
+
@@ -1,110 +0,0 @@
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-#
-# Docker Buildx Bake file.
-# Builds all Wazuh component images in parallel.
-#
-# Usage:
-#   docker buildx bake                          # build all (local, single-arch)
-#   docker buildx bake wazuh-manager            # build one component
-#   docker buildx bake --push                   # push to registry after build
-#
-# Variables are read automatically from the environment (see build-images.sh).
-
-# ── Global variables ──────────────────────────────────────────────────────────
-
-variable "WAZUH_VERSION"  { default = "5.0.0" }
-variable "WAZUH_REGISTRY" { default = "docker.io" }
-
-# Set IMAGE_TAG externally to override; defaults to WAZUH_VERSION.
-variable "IMAGE_TAG" { default = WAZUH_VERSION }
-
-# MULTIARCH: set to a non-empty value to build linux/amd64 + linux/arm64.
-variable "MULTIARCH" { default = "" }
-
-# Per-component tags — all default to IMAGE_TAG.
-# In dev builds the shell script sets each one independently to append the
-# per-component commit ref (e.g. MANAGER_TAG=5.0.0-beta1-abc1234).
-variable "INDEXER_TAG"   { default = IMAGE_TAG }
-variable "MANAGER_TAG"   { default = IMAGE_TAG }
-variable "DASHBOARD_TAG" { default = IMAGE_TAG }
-variable "AGENT_TAG"     { default = IMAGE_TAG }
-
-# ── Artifact URL variables ────────────────────────────────────────────────────
-# Populated by build-images.sh from artifacts_env.txt (sourced into env).
-
-variable "wazuh_indexer_x86_64_rpm"    { default = "" }
-variable "wazuh_indexer_aarch64_rpm"   { default = "" }
-variable "wazuh_manager_x86_64_rpm"    { default = "" }
-variable "wazuh_manager_aarch64_rpm"   { default = "" }
-variable "wazuh_dashboard_x86_64_rpm"  { default = "" }
-variable "wazuh_dashboard_aarch64_rpm" { default = "" }
-variable "wazuh_agent_x86_64_rpm"      { default = "" }
-variable "wazuh_agent_aarch64_rpm"     { default = "" }
-variable "wazuh_certs_tool"            { default = "" }
-variable "wazuh_config_yml"            { default = "" }
-
-# ── Default group: builds all components ─────────────────────────────────────
-
-group "default" {
-  targets = ["wazuh-indexer", "wazuh-manager", "wazuh-dashboard", "wazuh-agent"]
-}
-
-# ── Shared base target ────────────────────────────────────────────────────────
-# All component targets inherit from here. Not built directly.
-
-target "_common" {
-  # MULTIARCH=true  → build linux/amd64 + linux/arm64 (requires --push, no --load for multi-platform)
-  # MULTIARCH unset → null means "native platform of the build host" (amd64 on x86, arm64 on ARM)
-  platforms = MULTIARCH != "" ? ["linux/amd64", "linux/arm64"] : null
-  args = {
-    WAZUH_VERSION = WAZUH_VERSION
-  }
-}
-
-# ── Component targets ─────────────────────────────────────────────────────────
-
-target "wazuh-indexer" {
-  inherits = ["_common"]
-  context  = "wazuh-indexer/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${INDEXER_TAG}"]
-  args = {
-    wazuh_indexer_x86_64_rpm  = wazuh_indexer_x86_64_rpm
-    wazuh_indexer_aarch64_rpm = wazuh_indexer_aarch64_rpm
-    wazuh_certs_tool          = wazuh_certs_tool
-    wazuh_config_yml          = wazuh_config_yml
-  }
-}
-
-target "wazuh-manager" {
-  inherits = ["_common"]
-  context  = "wazuh-manager/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-manager:${MANAGER_TAG}"]
-  args = {
-    wazuh_manager_x86_64_rpm  = wazuh_manager_x86_64_rpm
-    wazuh_manager_aarch64_rpm = wazuh_manager_aarch64_rpm
-    wazuh_certs_tool          = wazuh_certs_tool
-    wazuh_config_yml          = wazuh_config_yml
-  }
-}
-
-target "wazuh-dashboard" {
-  inherits = ["_common"]
-  context  = "wazuh-dashboard/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${DASHBOARD_TAG}"]
-  args = {
-    wazuh_dashboard_x86_64_rpm  = wazuh_dashboard_x86_64_rpm
-    wazuh_dashboard_aarch64_rpm = wazuh_dashboard_aarch64_rpm
-    wazuh_certs_tool            = wazuh_certs_tool
-    wazuh_config_yml            = wazuh_config_yml
-  }
-}
-
-target "wazuh-agent" {
-  inherits = ["_common"]
-  context  = "wazuh-agent/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-agent:${AGENT_TAG}"]
-  args = {
-    wazuh_agent_x86_64_rpm  = wazuh_agent_x86_64_rpm
-    wazuh_agent_aarch64_rpm = wazuh_agent_aarch64_rpm
-  }
-}
@@ -1,83 +1,34 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+FROM amazonlinux:2023

-################################################################################
-# Build stage 0 (builder):
-# Install Wazuh Agent RPM and download tini (static PID-1 init shim).
-################################################################################
-FROM amazonlinux:2023 AS builder
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh

 ARG WAZUH_VERSION
-ARG TINI_VERSION="v0.19.0"
+ARG S6_VERSION="v2.2.0.3"
 ARG WAZUH_MANAGER='CHANGE_MANAGER_IP'
 ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
 ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
 ARG TARGETARCH
 ARG wazuh_agent_x86_64_rpm
 ARG wazuh_agent_aarch64_rpm
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101

-# Install only runtime dependencies
-RUN dnf install procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh || groupadd -r -g ${WAZUH_GID} wazuh && \
-    getent passwd wazuh || useradd --system \
-        --no-create-home \
-        --home-dir /var/ossec \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh && \
-    RPM_ARCH="x86_64" && \
+RUN RPM_ARCH="x86_64" && \
    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
    URL_VAR="wazuh_agent_${RPM_ARCH}_rpm" && \
    agent_url="${!URL_VAR}" && \
-    dnf install curl-minimal tar gzip procps shadow-utils -y && \
+    dnf install curl-minimal tar gzip procps -y &&\
    curl -o /wazuh-agent.rpm "${agent_url}" && \
    dnf install /wazuh-agent.rpm -y && \
    rm -rf /wazuh-agent.rpm && \
    dnf clean all && \
-    sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf
-
-# Download tini static binary (no external library dependencies)
-RUN curl --fail --silent -L \
-    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TARGETARCH} \
-    -o /usr/local/bin/tini && \
-    chmod +x /usr/local/bin/tini
-
-################################################################################
-# Build stage 1 (the actual Wazuh Agent image):
-# Copy Wazuh Agent and tini from builder. Install only runtime dependencies.
-################################################################################
-FROM amazonlinux:2023
-
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-
-# Install only runtime dependencies
-RUN dnf install procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh || groupadd -r -g ${WAZUH_GID} wazuh && \
-    getent passwd wazuh || useradd --system \
-        --no-create-home \
-        --home-dir /var/ossec \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh
-
-# Copy Wazuh Agent installation from builder
-COPY --from=builder /var/ossec /var/ossec
-
-# Copy tini static binary
-COPY --from=builder /usr/local/bin/tini /usr/local/bin/tini
-
-# Copy entrypoint and init scripts
-COPY config/entrypoint.sh /entrypoint.sh
+    sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf && \
+    S6_ARCH="amd64" && \
+    if [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi && \
+    curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz \
+    -o /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
+    tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" && \
+    tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin && \
+    rm  /tmp/s6-overlay-${S6_ARCH}.tar.gz
 COPY config/etc/ /etc/

-RUN chmod 755 /entrypoint.sh
-
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/entrypoint.sh"]
+ENTRYPOINT [ "/init" ]
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-# Run initialization and configuration
-bash /etc/cont-init.d/0-wazuh-init
-
-# Start Wazuh Agent (may log warnings if manager address is not configured)
-bash /etc/cont-init.d/1-agent
-
-# Tail the main log to stdout so Docker captures it
-tail -F /var/ossec/logs/ossec.log &
-TAIL_PID=$!
-
-# Graceful shutdown: stop Wazuh and exit cleanly on SIGTERM/SIGINT
-_stop() {
-    echo "Stopping Wazuh Agent..."
-    /var/ossec/bin/wazuh-control stop 2>/dev/null || true
-    kill "${TAIL_PID}" 2>/dev/null || true
-}
-trap _stop SIGTERM SIGINT SIGQUIT
-
-wait "${TAIL_PID}"
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)

 WAZUH_INSTALL_PATH=/var/ossec
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash

 ##############################################################################
 # Migration sequence
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/with-contenv sh

 # dumping ossec.log to standard output
 exec tail -F /var/ossec/logs/ossec.log
@@ -7,28 +7,9 @@ ARG TARGETARCH
 ARG wazuh_dashboard_x86_64_rpm
 ARG wazuh_dashboard_aarch64_rpm
 ARG wazuh_config_yml
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-# Set environment variables
-ENV USER="wazuh-dashboard" \
-    GROUP="wazuh-dashboard" \
-    NAME="wazuh-dashboard" \
-    INSTALL_DIR="/usr/share/wazuh-dashboard" 

 # Update and install dependencies
-RUN yum install shadow-utils -y && \
-    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
-    useradd --system \
-    --uid ${WAZUH_UID} \
-    --no-create-home \
-    --home-dir $INSTALL_DIR \
-    --gid $GROUP \
-    --shell /sbin/nologin \
-    --comment "$USER user" \
-    $USER && \
-    RPM_ARCH="x86_64" && \
+RUN RPM_ARCH="x86_64" && \
    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
    URL_VAR="wazuh_dashboard_${RPM_ARCH}_rpm" && \
    dashboard_url="${!URL_VAR}" && \
@@ -43,6 +24,7 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
 RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config
 RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs
 RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
+RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node

 ################################################################################
 # Build stage 1 (the current Wazuh dashboard image):
@@ -53,9 +35,6 @@ RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
 ################################################################################
 FROM amazonlinux:2023

-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
 # Set environment variables
 ENV USER="wazuh-dashboard" \
    GROUP="wazuh-dashboard" \
@@ -82,25 +61,25 @@ COPY config/wazuh_dashboard_config.sh /
 # Update and install dependencies
 RUN yum install shadow-utils -y && \
    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
+    getent group $GROUP || groupadd -r -g 1000 $GROUP && \
    useradd --system \
-    --uid ${WAZUH_UID} \
-    --no-create-home \
-    --home-dir $INSTALL_DIR \
-    --gid $GROUP \
-    --shell /sbin/nologin \
-    --comment "$USER user" \
-    $USER && \
+            --uid 1000 \
+            --no-create-home \
+            --home-dir $INSTALL_DIR \
+            --gid $GROUP \
+            --shell /sbin/nologin \
+            --comment "$USER user" \
+            $USER && \
    chmod 700 /entrypoint.sh && \
    chmod 700 /wazuh_dashboard_config.sh && \
    mkdir -p $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} /*.sh && \
+    chown 1000:1000 $INSTALL_DIR && \
+    chown 1000:1000 /*.sh && \
    mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom

 # Copy Install dir from builder to current image
-COPY --from=builder $INSTALL_DIR $INSTALL_DIR
-COPY --from=builder /etc/wazuh-dashboard $INSTALL_DIR/config/
+COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR
+COPY --from=builder --chown=1000:1000 /etc/wazuh-dashboard $INSTALL_DIR/config/

 # Set workdir and user
 WORKDIR $INSTALL_DIR
@@ -7,28 +7,10 @@ ARG wazuh_indexer_x86_64_rpm
 ARG wazuh_indexer_aarch64_rpm
 ARG wazuh_certs_tool
 ARG wazuh_config_yml
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-ENV USER="wazuh-indexer" \
-    GROUP="wazuh-indexer" \
-    NAME="wazuh-indexer" \
-    INSTALL_DIR="/usr/share/wazuh-indexer" 

 COPY config/config.sh .

-RUN yum install curl-minimal shadow-utils findutils hostname -y && \
-    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
-    useradd --system \
-            --uid ${WAZUH_UID} \
-            --no-create-home \
-            --home-dir $INSTALL_DIR \
-            --gid ${WAZUH_GID} \
-            --shell /sbin/nologin \
-            --comment "$USER user" \
-            $USER && \
-    RPM_ARCH="x86_64" && \
+RUN RPM_ARCH="x86_64" && \
    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
    URL_VAR="wazuh_indexer_${RPM_ARCH}_rpm" && \
    indexer_url="${!URL_VAR}" && \
@@ -47,14 +29,10 @@ RUN yum install curl-minimal shadow-utils findutils hostname -y && \
 ################################################################################
 FROM amazonlinux:2023

-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
 ENV USER="wazuh-indexer" \
    GROUP="wazuh-indexer" \
    NAME="wazuh-indexer" \
-    INSTALL_DIR="/usr/share/wazuh-indexer" 
-ENV ENGINE_DIR="$INSTALL_DIR/engine"
+    INSTALL_DIR="/usr/share/wazuh-indexer"


 COPY config/entrypoint.sh /
@@ -62,37 +40,30 @@ COPY config/securityadmin.sh /

 RUN yum install curl-minimal shadow-utils findutils hostname -y && \
    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
+    getent group $GROUP || groupadd -r -g 1000 $GROUP && \
    useradd --system \
-            --uid ${WAZUH_UID} \
+            --uid 1000 \
            --no-create-home \
            --home-dir $INSTALL_DIR \
-            --gid ${WAZUH_GID} \
+            --gid $GROUP \
            --shell /sbin/nologin \
            --comment "$USER user" \
            $USER && \
    chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh && \
    mkdir -p $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} /*.sh && \
-    mkdir -p /var/lib/wazuh-indexer && chown ${WAZUH_UID}:${WAZUH_GID} /var/lib/wazuh-indexer && \
-    mkdir -p $INSTALL_DIR/logs && chown ${WAZUH_UID}:${WAZUH_GID} $INSTALL_DIR/logs && \
-    mkdir -p /run/wazuh-indexer && chown ${WAZUH_UID}:${WAZUH_GID} /run/wazuh-indexer && \
-    mkdir -p /var/log/wazuh-indexer && chown ${WAZUH_UID}:${WAZUH_GID} /var/log/wazuh-indexer
+    chown 1000:1000 $INSTALL_DIR && \
+    chown 1000:1000 /*.sh && \
+    mkdir -p /var/lib/wazuh-indexer && chown 1000:1000 /var/lib/wazuh-indexer && \
+    mkdir -p $INSTALL_DIR/logs && chown 1000:1000 $INSTALL_DIR/logs && \
+    mkdir -p /run/wazuh-indexer && chown 1000:1000 /run/wazuh-indexer && \
+    mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer

-COPY --from=builder $INSTALL_DIR $INSTALL_DIR
+COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR

 RUN chmod 700 $INSTALL_DIR && \
    chmod 700 $INSTALL_DIR/config && \
    chmod 600 $INSTALL_DIR/config/jvm.options && \
-    chmod 600 $INSTALL_DIR/config/opensearch.yml && \
-    if [ -d "$ENGINE_DIR" ]; then \
-    find "$ENGINE_DIR" -type d -exec chmod 750 {} + && \
-    find "$ENGINE_DIR" -type f -exec chmod 640 {} + && \
-    { [ -f "$ENGINE_DIR/run_engine.sh" ] && chmod 750 "$ENGINE_DIR/run_engine.sh" || true; } && \
-    { [ -f "$ENGINE_DIR/bin/wazuh-engine" ] && chmod 750 "$ENGINE_DIR/bin/wazuh-engine" || true; } && \
-    { [ -d "$ENGINE_DIR/sockets" ] && chmod 777 "$ENGINE_DIR/sockets" || true; }; \
-    fi
+    chmod 600 $INSTALL_DIR/config/opensearch.yml

 USER wazuh-indexer
 WORKDIR $INSTALL_DIR
@@ -13,9 +13,7 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
 # Modify opensearch.yml config paths
 if [ -d "/etc/wazuh-indexer" ]; then
    mkdir -p ${CONFIG_DIR}
-    chown ${USER}:${GROUP} ${CONFIG_DIR}
    mkdir -p ${CONFIG_DIR}/certs
-    chown ${USER}:${GROUP} ${CONFIG_DIR}/certs
    mv /etc/wazuh-indexer/* ${CONFIG_DIR}/
    rmdir /etc/wazuh-indexer
 fi
@@ -58,12 +58,6 @@ function runOpensearch {
        fi
    done < <(env)

-    # Start Wazuh Engine
-    if [ -x "$OPENSEARCH_HOME/engine/run_engine.sh" ]; then
-        nohup "$OPENSEARCH_HOME/engine/run_engine.sh" > /dev/null 2>&1 &
-        echo $! > /run/wazuh-indexer/wazuh-engine.pid
-    fi
-
    # Start opensearch
    exec "$@" "${opensearch_opts[@]}"

@@ -1,101 +1,53 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+FROM amazonlinux:2023

-################################################################################
-# Build stage 0 (builder):
-# Install Wazuh Manager RPM, configure directories, prepare permanent data,
-# and download tini (static PID-1 init shim).
-################################################################################
-FROM amazonlinux:2023 AS builder
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh

 ARG WAZUH_VERSION
-ARG TINI_VERSION="v0.19.0"
+ARG S6_VERSION="v2.2.0.3"
 ARG TARGETARCH
 ARG wazuh_manager_x86_64_rpm
 ARG wazuh_manager_aarch64_rpm
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101

-# Prepare permanent data config needed by permanent_data.sh at build time
-COPY config/permanent_data.env config/permanent_data.sh /
-
-RUN dnf install openssl findutils procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh-manager || groupadd -r -g ${WAZUH_GID} wazuh-manager && \
-    getent passwd wazuh-manager || useradd --system \
-        --no-create-home \
-        --home-dir /var/wazuh-manager \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh-manager && \
-    RPM_ARCH="x86_64" && \
+RUN RPM_ARCH="x86_64" && \
    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
    URL_VAR="wazuh_manager_${RPM_ARCH}_rpm" && \
    manager_url="${!URL_VAR}" && \
-    dnf install curl-minimal xz gnupg tar gzip -y && \
+    dnf install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
    dnf clean all && \
    curl -o /wazuh-manager.rpm "${manager_url}" && \
    dnf install /wazuh-manager.rpm -y && \
    rm -rf /wazuh-manager.rpm && \
    dnf clean all && \
-    # Set up required directories with correct ownership
-    mkdir -p /var/wazuh-manager/var/multigroups && \
+    S6_ARCH="amd64" && \
+    if [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi && \
+    curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz \
+    -o /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
+    tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" && \
+    tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin && \
+    rm  /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
+    rm -f /var/wazuh-manager/etc/sslmanager.key && \
+    rm -f /var/wazuh-manager/etc/sslmanager.cert
+
+COPY config/etc/ /etc/
+# Prepare permanent data
+# Sync calls are due to https://github.com/docker/docker/issues/9547
+
+COPY config/permanent_data.env config/permanent_data.sh /
+
+#Make mount directories for keep permissions
+
+RUN mkdir -p /var/wazuh-manager/var/multigroups && \
    chown root:wazuh-manager /var/wazuh-manager/var/multigroups && \
    chmod 770 /var/wazuh-manager/var/multigroups && \
    mkdir -p /var/wazuh-manager/etc/certs && \
    chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/certs && \
    chmod 500 /var/wazuh-manager/etc/certs && \
-    rm -f /var/wazuh-manager/etc/sslmanager.key && \
-    rm -f /var/wazuh-manager/etc/sslmanager.cert
-
-# Prepare permanent data snapshot (sync calls: https://github.com/docker/docker/issues/9547)
-RUN chmod 755 /permanent_data.sh && \
+    chmod 755 /permanent_data.sh && \
    sync && /permanent_data.sh && \
    sync && rm /permanent_data.sh

-# Download tini static binary (no external library dependencies)
-RUN curl --fail --silent -L \
-    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TARGETARCH} \
-    -o /usr/local/bin/tini && \
-    chmod +x /usr/local/bin/tini
-
-################################################################################
-# Build stage 1 (the actual Wazuh Manager image):
-# Copy Wazuh Manager and tini from builder. Install only runtime dependencies.
-################################################################################
-FROM amazonlinux:2023
-
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-
-# Install only runtime dependencies (no curl, tar, gzip, xz, or full dnf stack)
-RUN dnf install openssl findutils procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh-manager || groupadd -r -g ${WAZUH_GID} wazuh-manager && \
-    getent passwd wazuh-manager || useradd --system \
-        --no-create-home \
-        --home-dir /var/wazuh-manager \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh-manager
-
-# Copy Wazuh Manager installation (includes permanent data snapshot)
-COPY --from=builder /var/wazuh-manager /var/wazuh-manager
-
-# Copy tini static binary
-COPY --from=builder /usr/local/bin/tini /usr/local/bin/tini
-
-# Copy entrypoint, init scripts and runtime config
-COPY config/entrypoint.sh /entrypoint.sh
-COPY config/etc/ /etc/
-COPY config/permanent_data.env /
-
-RUN chmod 755 /entrypoint.sh
-
 # Services ports
 EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp

-ENTRYPOINT ["/usr/local/bin/tini", "--", "/entrypoint.sh"]
+ENTRYPOINT [ "/init" ]
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-# Run initialization and configuration
-bash /etc/cont-init.d/0-wazuh-init
-
-# Start Wazuh Manager (may log warnings in environments without certs)
-bash /etc/cont-init.d/1-manager
-
-# Tail the main log to stdout so Docker captures it
-tail -F /var/wazuh-manager/logs/wazuh-manager.log &
-TAIL_PID=$!
-
-# Graceful shutdown: stop Wazuh and exit cleanly on SIGTERM/SIGINT
-_stop() {
-    echo "Stopping Wazuh Manager..."
-    /var/wazuh-manager/bin/wazuh-manager-control stop 2>/dev/null || true
-    kill "${TAIL_PID}" 2>/dev/null || true
-}
-trap _stop SIGTERM SIGINT SIGQUIT
-
-wait "${TAIL_PID}"
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)

 # Variables
@@ -252,9 +252,9 @@ configure_permissions() {
 ##############################################################################

 set_correct_permOwner() {
-  find /var/wazuh-manager/ -group 997 -exec chown :101 {} +;
-  find /var/wazuh-manager/ -group 999 -exec chown :101 {} +;
-  find /var/wazuh-manager/ -user 999 -exec chown 101:{} +;
+  find /var/wazuh-manager/ -group 997 -exec chown :999 {} +;
+  find /var/wazuh-manager/ -group 101 -exec chown :999 {} +;
+  find /var/wazuh-manager/ -user 101 -exec chown 999 {} +;
 }

 ##############################################################################
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash

 ##############################################################################
 # Migration sequence
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/with-contenv sh

 # dumping wazuh-manager.log to standard output
 exec tail -F /var/wazuh-manager/logs/wazuh-manager.log
@@ -28,7 +28,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit

 	├── build-docker-images
 	│   ├── build-images.sh
-	│   ├── docker-bake.hcl
+	│   ├── build-images.yml
 	│   ├── README.md
 	│   ├── wazuh-agent
 	│   │   ├── config
@@ -19,7 +19,7 @@ Then execute:
 The script also allows to build images from other versions of Wazuh by using the `-v` or `--version` argument:

 ```bash
-./build-images.sh -v 5.0.0
+./build-images.sh -v 5.1.0
 ```

 To get all the available script options use the `-h` or `--help` option:
@@ -32,7 +32,7 @@ Usage: build-images.sh [OPTIONS]
    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default.
    -refs, --references <ref>    [Optional] Set each Wazuh component reference to be build (indexer, manager, dasboard and agent). By default, using the latest release: ['latest', 'latest', 'latest', 'latest']
    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images.
-    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 5.0.0.
+    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 5.1.0.
    -m, --multiarch              [Optional] Enable multi-architecture builds.
    -h, --help                   Show this help.

@@ -1,6 +1,6 @@
 # Development Guide - Introduction

-Welcome to the Development Guide for Wazuh-docker version 5.0.0 This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development.
+Welcome to the Development Guide for Wazuh-docker version 5.1.0 This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development.

 ## Purpose of This Guide

@@ -1,6 +1,6 @@
 # Development Guide - Setup Environment

-This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 5.0.0). A proper setup is crucial for building images, running tests, and contributing effectively.
+This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 5.1.0). A proper setup is crucial for building images, running tests, and contributing effectively.

 ## Prerequisites

@@ -26,12 +26,12 @@ Before you begin, ensure your system meets the following requirements:
 Follow these steps to prepare your development environment:

 1.  **Clone the Repository**:
-    Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `5.0.0`.
+    Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `5.1.0`.

    ```bash
    git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
    cd wazuh-docker
-    git checkout v5.0.0
+    git checkout v5.1.0
    ```

 2.  **Verify Docker Installation**:
@@ -6,7 +6,7 @@ The Procedure_push_docker_images.yml workflow builds and pushes multi-architectu

 | Parameter | Description | Default | Required |
 |-----------|-------------|---------|----------|
-| `image_tag` | Docker image version tag | `5.0.0` | Yes |
+| `image_tag` | Docker image version tag | `5.1.0` | Yes |
 | `docker_reference` | Branch/tag to build from | - | Yes |
 | `reference` | Dev reference (for pre-release builds) | `latest` | No |
 | `id` | Workflow run identifier | - | No |
@@ -38,7 +38,7 @@ The Procedure_push_docker_images.yml workflow builds and pushes multi-architectu
 2. **Multi-architecture Build**:
   - Uses Docker Buildx with QEMU for cross-platform builds
   - Builds for `linux/amd64` and `linux/arm64`
-   - Leverages `docker-bake.hcl` for parallel multi-arch build configuration
+   - Leverages `build-images.yml` for build configuration

 3. **Image Publishing**:
   - Tags images appropriately based on mode
@@ -2,5 +2,5 @@

 For backup and restore, refer to the documentation for each component:

- [Wazuh manager](https://github.com/wazuh/wazuh/blob/v5.0.0/docs/ref/backup-restore.md)
- [Wazuh agent](https://github.com/wazuh/wazuh-agent/blob/v5.0.0/docs/ref/backup-restore.md)
+- [Wazuh manager](https://github.com/wazuh/wazuh/blob/v5.1.0/docs/ref/backup-restore.md)
+- [Wazuh agent](https://github.com/wazuh/wazuh-agent/blob/v5.1.0/docs/ref/backup-restore.md)
@@ -28,7 +28,7 @@
        docker compose up -d
        ```

-Consult the official Wazuh documentation for version 5.0.0 for detailed information on all possible configuration parameters for each component.
+Consult the official Wazuh documentation for version 5.1.0 for detailed information on all possible configuration parameters for each component.

 ## Persistence configuration

@@ -1,6 +1,6 @@
 # Reference Manual - Configuration

-This section details how to configure your Wazuh-Docker deployment (version 5.0.0). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment.
+This section details how to configure your Wazuh-Docker deployment (version 5.1.0). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment.

 ## Overview of Configuration Methods

@@ -1,6 +1,6 @@
 # Reference Manual - Deployment

-This section provides detailed instructions for deploying Wazuh-Docker (version 5.0.0) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments.
+This section provides detailed instructions for deploying Wazuh-Docker (version 5.1.0) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments.

 ## Overview of Deployment Options

@@ -24,11 +24,11 @@ Ensure you have:

 -   Met all the [System Requirements](../requirements.md).
 -   Installed Docker and Docker Compose on your host(s).
-   Cloned the `wazuh-docker` repository (version `5.0.0`) or downloaded the necessary deployment files.
+-   Cloned the `wazuh-docker` repository (version `5.1.0`) or downloaded the necessary deployment files.
    ```bash
    git clone https://github.com/wazuh/wazuh-docker.git
    cd wazuh-docker
-    git checkout v5.0.0
+    git checkout v5.1.0
    ```
 -   Made a backup of any existing Wazuh data if you are migrating or upgrading.

@@ -21,8 +21,8 @@ This deployment utilizes the `multi-node/docker-compose.yml` file, which defines
 3.  Download the certificate creation script and config.yml file:

    ```bash
-    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh
-    curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml
+    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.1.0-1.sh
+    curl -o config.yml https://packages.wazuh.com/5.0/config-5.1.0-1.yml
    ```

 4.  Edit the `config.yml` file with the configuration of the Wazuh components to be deployed
@@ -21,8 +21,8 @@ This deployment uses the `single-node/docker-compose.yml` file, which defines a
 3.  Download the certificate creation script and `config.yml` file:

    ```bash
-    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh
-    curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml
+    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.1.0-1.sh
+    curl -o config.yml https://packages.wazuh.com/5.0/config-5.1.0-1.yml
    ```

 4.  Edit the config.yml file with the configuration of the Wazuh components to be deployed
@@ -1,6 +1,6 @@
 # Reference Manual - Getting Started

-This section guides you through the initial steps to get your Wazuh-docker (version 5.0.0) environment up and running. We will cover the prerequisites and point you to the deployment instructions.
+This section guides you through the initial steps to get your Wazuh-docker (version 5.1.0) environment up and running. We will cover the prerequisites and point you to the deployment instructions.

 ## Overview

@@ -27,11 +27,11 @@ Before diving into the deployment, please ensure you have reviewed:
    Verify that your host system has sufficient RAM, CPU, and disk space. Ensure Docker and Docker Compose are installed and functioning correctly.

 2.  **Obtain Wazuh-docker Configuration**:
-    You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 5.0.0.
+    You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 5.1.0.
    ```bash
    git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
    cd wazuh-docker
-    git checkout v5.0.0
+    git checkout v5.1.0
    # Navigate to the specific docker-compose directory, e.g., single-node or multi-node
    # cd docker-compose/single-node/ (example path)
    ```
@@ -1,6 +1,6 @@
 # Reference Manual - Requirements

-Before deploying Wazuh-Docker (version 5.0.0), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment.
+Before deploying Wazuh-Docker (version 5.1.0), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment.

 ## Host System Requirements

@@ -53,7 +53,7 @@ These are general recommendations. Actual needs may vary based on the number of
 * **Docker Desktop**
    * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/windows-install/).
 * **WSL Linux distribution**
-    * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not compatible with wazuh-certs-tool-5.0.0-1.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/)
+    * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not compatible with wazuh-certs-tool-5.1.0-1.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/)
 * **Git Client**:
    * Required for cloning the `wazuh-docker` repository.
 * **Web Browser**:
@@ -1,6 +1,6 @@
 # Reference Manual - Glossary

-This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 5.0.0).
+This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 5.1.0).

 ---

@@ -22,7 +22,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their

 **D**

-   **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 5.0.0, this is typically OpenSearch Dashboards.
+-   **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 5.1.0, this is typically OpenSearch Dashboards.
 -   **Decoder**: A component in the Wazuh Manager that parses and extracts relevant information (fields) from raw log messages or event data.
 -   **Docker**: An open platform for developing, shipping, and running applications inside containers.
 -   **Docker Compose**: A tool for defining and running multi-container Docker applications. It uses a YAML file (`docker-compose.yml`) to configure the application's services, networks, and volumes.
@@ -42,7 +42,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their

 **I**

-   **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 5.0.0, this is typically OpenSearch.
+-   **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 5.1.0, this is typically OpenSearch.

 **L**

@@ -1,6 +1,6 @@
 # Reference Manual - Description

-This section provides a detailed description of Wazuh-docker (version 5.0.0), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment.
+This section provides a detailed description of Wazuh-docker (version 5.1.0), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment.

 ## What is Wazuh?

@@ -18,7 +18,7 @@ Wazuh-docker is a project that provides Docker images and `docker compose` confi

 ## Core Components in Wazuh-Docker

-The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 5.0.0:
+The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 5.1.0:

 1.  **Wazuh Manager**:
    -   The central component that collects and analyzes data from deployed Wazuh agents.
@@ -28,7 +28,7 @@ The Wazuh-Docker project typically provides images for the following core Wazuh
 2.  **Wazuh Indexer**:
    -   A highly scalable, full-text search and analytics engine.
    -   Based on OpenSearch (or historically Elasticsearch), it stores and indexes alerts and monitoring data generated by the Wazuh manager.
-    -   The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 5.0.0, this is typically an OpenSearch-based component.
+    -   The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 5.1.0, this is typically an OpenSearch-based component.

 3.  **Wazuh Dashboard**:
    -   A flexible visualization tool based on OpenSearch Dashboards (or historically Kibana).
@@ -1,6 +1,6 @@
 # Reference Manual - Introduction

-Welcome to the Reference Manual for Wazuh-Docker, version 5.0.0. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker.
+Welcome to the Reference Manual for Wazuh-Docker, version 5.1.0. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker.

 ## Purpose of This Manual

@@ -44,4 +44,4 @@ This manual is structured to help you find information efficiently:
 -   If you need to customize your deployment, refer to the [Configuration](configuration/configuration.md) section.
 -   For specific terms or concepts, consult the [Glossary](glossary.md).

-This manual refers to version 5.0.0 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version.
+This manual refers to version 5.1.0 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version.
@@ -19,20 +19,20 @@ Below is a step-by-step example of how to perform this update:
   - `wazuh.indexer`
   - `wazuh.dashboard`

-   Example (update to 5.0.0):
+   Example (update to 5.1.0):

   ```yaml
   services:
     wazuh.manager:
-       image: wazuh/wazuh-manager:5.0.0
+       image: wazuh/wazuh-manager:5.1.0
       ...

     wazuh.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
+       image: wazuh/wazuh-indexer:5.1.0
       ...

     wazuh.dashboard:
-       image: wazuh/wazuh-dashboard:5.0.0
+       image: wazuh/wazuh-dashboard:5.1.0
       ...
   ```

@@ -43,32 +43,32 @@ Below is a step-by-step example of how to perform this update:
   - `wazuh1.indexer`, `wazuh2.indexer`, and `wazuh3.indexer`
   - `wazuh.dashboard`

-   Example (update to 5.0.0):
+   Example (update to 5.1.0):

   ```yaml
   services:
     wazuh.master:
-       image: wazuh/wazuh-manager:5.0.0
+       image: wazuh/wazuh-manager:5.1.0
       ...

     wazuh.worker:
-       image: wazuh/wazuh-manager:5.0.0
+       image: wazuh/wazuh-manager:5.1.0
       ...

     wazuh1.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
+       image: wazuh/wazuh-indexer:5.1.0
       ...

     wazuh2.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
+       image: wazuh/wazuh-indexer:5.1.0
       ...

     wazuh3.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
+       image: wazuh/wazuh-indexer:5.1.0
       ...

     wazuh.dashboard:
-       image: wazuh/wazuh-dashboard:5.0.0
+       image: wazuh/wazuh-dashboard:5.1.0
       ...
   ```

@@ -0,0 +1,283 @@
+# Opendistro data migration to Wazuh indexer on docker.
+This procedure explains how to migrate Opendistro data from Opendistro to Wazuh indexer in docker production deployments.
+The example is migrating from v4.2 to v4.4.
+
+## Procedure
+Assuming that you have a v4.2 production deployment, perform the following steps.
+
+**1. Stop 4.2 environment**
+`docker-compose -f production-cluster.yml stop`
+
+**2. List elasticsearch volumes**
+`docker volume ls --filter name='wazuh-docker_elastic-data'`
+
+**3. Inspect elasticsearch volume**
+`docker volume inspect wazuh-docker_elastic-data-1`
+
+**4. Spin down the 4.2 environment.**
+`docker-compose -f production-cluster.yml down`
+
+**Steps 5 and 6 can be done with the volume-migrator.sh script, specifying Docker compose version and project name as parameters.**
+
+Ex: $ multi-node/volume-migrator.sh 1.25.0 multi-node
+
+**5. Run the volume create command:** create new indexer and Wazuh manager volumes using the `com.docker.compose.version` label value from the previous command.
+
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=wazuh-indexer-data-1 \
+           multi-node_wazuh-indexer-data-1
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=wazuh-indexer-data-2 \
+           multi-node_wazuh-indexer-data-2
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=wazuh-indexer-data-3 \
+           multi-node_wazuh-indexer-data-3
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master_wazuh_api_configuration \
+           multi-node_master_wazuh_api_configuration
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master_wazuh_etc \
+           multi-node_docker_wazuh_etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-logs \
+           multi-node_master-wazuh-logs
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-queue \
+           multi-node_master-wazuh-queue
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-var-multigroups \
+           multi-node_master-wazuh-var-multigroups
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-active-response \
+           multi-node_master-wazuh-active-response
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-etc \
+           multi-node_master-wazuh-etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-var \
+           multi-node_master-wazuh-var
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker_wazuh_api_configuration \
+           multi-node_worker_wazuh_api_configuration
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker_wazuh_etc \
+           multi-node_worker-wazuh-etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-logs \
+           multi-node_worker-wazuh-logs
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-queue \
+           multi-node_worker-wazuh-queue
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-var-multigroups \
+           multi-node_worker-wazuh-var-multigroups
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-active-response \
+           multi-node_worker-wazuh-active-response
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-etc \
+           multi-node_worker-wazuh-etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-var \
+           multi-node_worker-wazuh-var
+```
+**6. Copy the volume content from elasticsearch to Wazuh indexer volumes and old Wazuh manager content to new volumes.**
+```
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-1:/from \
+           -v multi-node_wazuh-indexer-data-1:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-2:/from \
+           -v multi-node_wazuh-indexer-data-2:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-3:/from \
+           -v multi-node_wazuh-indexer-data-3:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-api-configuration:/from \
+           -v multi-node_master-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-etc:/from \
+           -v multi-node_master-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-logs:/from \
+           -v multi-node_master-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-queue:/from \
+           -v multi-node_master-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-var-multigroups:/from \
+           -v multi-node_master-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-active-response:/from \
+           -v multi-node_master-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker-etc:/from \
+           -v multi-node_master-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker-var:/from \
+           -v multi-node_master-wazuh-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-api-configuration:/from \
+           -v multi-node_worker-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-etc:/from \
+           -v multi-node_worker-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-logs:/from \
+           -v multi-node_worker-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-queue:/from \
+           -v multi-node_worker-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-var-multigroups:/from \
+           -v multi-node_worker-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-active-response:/from \
+           -v multi-node_worker-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-etc:/from \
+           -v multi-node_worker-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-var:/from \
+           -v multi-node_worker-wazuh-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+
+**7. Start the 4.4 environment.**
+```
+git checkout 4.4
+cd multi-node
+docker-compose -f generate-indexer-certs.yml run --rm generator
+docker-compose up -d
+```
+
+**8. Check the access to Wazuh dashboard**: go to the Wazuh dashboard using the web browser and check the data.
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
  wazuh.master:
-    image: wazuh/wazuh-manager:5.0.0
+    image: wazuh/wazuh-manager:5.1.0
    hostname: wazuh.master
    container_name: multi-node-wazuh.master
    restart: always
@@ -9,11 +9,10 @@ services:
      wazuh1.indexer:
        condition: service_healthy
    healthcheck:
-      test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -q 'not running' && exit 1 || exit 0" ]
+      test: [ "CMD-SHELL", "curl -k -s -o /dev/null https://localhost:55000 || exit 1" ]
      interval: 15s
      timeout: 5s
      retries: 5
-      start_period: 60s
    ulimits:
      memlock:
        soft: -1
@@ -39,21 +38,21 @@ services:
      - master-wazuh-logs:/var/wazuh-manager/logs
      - master-wazuh-queue:/var/wazuh-manager/queue
      - master-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
-      - ./config/root-ca/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
+      - ./config/wazuh_master/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
      - ./config/wazuh_master/certs/wazuh.master.pem:/var/wazuh-manager/etc/certs/manager.pem
      - ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem

  wazuh.worker:
-    image: wazuh/wazuh-manager:5.0.0
+    image: wazuh/wazuh-manager:5.1.0
    hostname: wazuh.worker
    container_name: multi-node-wazuh.worker
    restart: always
    healthcheck:
-      test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -v apid | grep -q 'not running' && exit 1 || exit 0" ]
-      interval: 15s
+      test: [ "CMD-SHELL", "timeout 2 bash -c '</dev/tcp/localhost/1514' || exit 1" ]
+      interval: 5s
      timeout: 5s
-      retries: 5
-      start_period: 60s
+      retries: 10
+      start_period: 30s
    ulimits:
      memlock:
        soft: -1
@@ -78,12 +77,12 @@ services:
      - worker-wazuh-logs:/var/wazuh-manager/logs
      - worker-wazuh-queue:/var/wazuh-manager/queue
      - worker-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
-      - ./config/root-ca/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
+      - ./config/wazuh_worker/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
      - ./config/wazuh_worker/certs/wazuh.worker.pem:/var/wazuh-manager/etc/certs/manager.pem
      - ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem

  wazuh1.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:5.1.0
    hostname: wazuh1.indexer
    container_name: multi-node-wazuh1.indexer
    restart: always
@@ -114,14 +113,14 @@ services:
      start_period: 60s
    volumes:
      - wazuh-indexer-data-1:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
+      - ./config/wazuh1_indexer/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
      - ./config/wazuh1_indexer/certs/wazuh1.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
      - ./config/wazuh1_indexer/certs/wazuh1.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
      - ./config/wazuh1_indexer/certs/admin.pem:/usr/share/wazuh-indexer/config/certs/admin.pem
      - ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem

  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:5.1.0
    hostname: wazuh2.indexer
    container_name: multi-node-wazuh2.indexer
    restart: always
@@ -154,12 +153,12 @@ services:
      start_period: 60s
    volumes:
      - wazuh-indexer-data-2:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
+      - ./config/wazuh2_indexer/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
      - ./config/wazuh2_indexer/certs/wazuh2.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
      - ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem

  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:5.1.0
    hostname: wazuh3.indexer
    container_name: multi-node-wazuh3.indexer
    restart: always
@@ -192,12 +191,12 @@ services:
      start_period: 60s
    volumes:
      - wazuh-indexer-data-3:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
+      - ./config/wazuh3_indexer/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
      - ./config/wazuh3_indexer/certs/wazuh3.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
      - ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:5.0.0
+    image: wazuh/wazuh-dashboard:5.1.0
    hostname: wazuh.dashboard
    container_name: multi-node-wazuh.dashboard
    restart: always
@@ -224,7 +223,7 @@ services:
    volumes:
      - ./config/wazuh_dashboard/certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/config/certs/wazuh-dashboard.pem
      - ./config/wazuh_dashboard/certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/config/certs/wazuh-dashboard-key.pem
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-dashboard/config/certs/root-ca.pem
+      - ./config/wazuh_dashboard/certs/root-ca.pem:/usr/share/wazuh-dashboard/config/certs/root-ca.pem
      - wazuh-dashboard-config:/usr/share/wazuh-dashboard/config
      - wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
    depends_on:
@@ -0,0 +1,213 @@
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=wazuh-indexer-data-1 \
+           $2_wazuh-indexer-data-1
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=wazuh-indexer-data-2 \
+           $2_wazuh-indexer-data-2
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=wazuh-indexer-data-3 \
+           $2_wazuh-indexer-data-3
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master_wazuh_api_configuration \
+           $2_master_wazuh_api_configuration
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master_wazuh_etc \
+           $2_docker_wazuh_etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-logs \
+           $2_master-wazuh-logs
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-queue \
+           $2_master-wazuh-queue
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-var-multigroups \
+           $2_master-wazuh-var-multigroups
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-active-response \
+           $2_master-wazuh-active-response
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-etc \
+           $2_master-wazuh-etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-var \
+           $2_master-wazuh-var
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker_wazuh_api_configuration \
+           $2_worker_wazuh_api_configuration
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker_wazuh_etc \
+           $2_worker-wazuh-etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-logs \
+           $2_worker-wazuh-logs
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-queue \
+           $2_worker-wazuh-queue
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-var-multigroups \
+           $2_worker-wazuh-var-multigroups
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-active-response \
+           $2_worker-wazuh-active-response
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-etc \
+           $2_worker-wazuh-etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-var \
+           $2_worker-wazuh-var
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-var:/from \
+           -v $2_worker-wazuh-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-1:/from \
+           -v $2_wazuh-indexer-data-1:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-2:/from \
+           -v $2_wazuh-indexer-data-2:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-3:/from \
+           -v $2_wazuh-indexer-data-3:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-api-configuration:/from \
+           -v $2_master-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-etc:/from \
+           -v $2_master-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-logs:/from \
+           -v $2_master-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-queue:/from \
+           -v $2_master-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-var-multigroups:/from \
+           -v $2_master-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-active-response:/from \
+           -v $2_master-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker-etc:/from \
+           -v $2_master-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker-var:/from \
+           -v $2_master-wazuh-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-api-configuration:/from \
+           -v $2_worker-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-etc:/from \
+           -v $2_worker-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-logs:/from \
+           -v $2_worker-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-queue:/from \
+           -v $2_worker-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-var-multigroups:/from \
+           -v $2_worker-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-active-response:/from \
+           -v $2_worker-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-etc:/from \
+           -v $2_worker-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-var:/from \
+           -v $2_worker-wazuh-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
  wazuh.manager:
-    image: wazuh/wazuh-manager:5.0.0
+    image: wazuh/wazuh-manager:5.1.0
    hostname: wazuh.manager
    container_name: single-node-wazuh.manager
    restart: always
@@ -9,11 +9,10 @@ services:
      wazuh.indexer:
        condition: service_healthy
    healthcheck:
-      test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -q 'not running' && exit 1 || exit 0" ]
+      test: [ "CMD-SHELL", "curl -k -s -o /dev/null https://localhost:55000 || exit 1" ]
      interval: 15s
      timeout: 5s
      retries: 5
-      start_period: 60s
    ulimits:
      memlock:
        soft: -1
@@ -39,12 +38,12 @@ services:
      - wazuh_logs:/var/wazuh-manager/logs
      - wazuh_queue:/var/wazuh-manager/queue
      - wazuh_var_multigroups:/var/wazuh-manager/var/multigroups
-      - ./config/root-ca/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
+      - ./config/wazuh_manager/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
      - ./config/wazuh_manager/certs/wazuh.manager.pem:/var/wazuh-manager/etc/certs/manager.pem
      - ./config/wazuh_manager/certs/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem

  wazuh.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:5.1.0
    hostname: wazuh.indexer
    container_name: single-node-wazuh.indexer
    restart: always
@@ -74,14 +73,14 @@ services:
      start_period: 60s
    volumes:
      - wazuh-indexer-data:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
+      - ./config/wazuh_indexer/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
      - ./config/wazuh_indexer/certs/wazuh.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
      - ./config/wazuh_indexer/certs/wazuh.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
      - ./config/wazuh_indexer/certs/admin.pem:/usr/share/wazuh-indexer/config/certs/admin.pem
      - ./config/wazuh_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:5.0.0
+    image: wazuh/wazuh-dashboard:5.1.0
    hostname: wazuh.dashboard
    container_name: single-node-wazuh.dashboard
    restart: always
@@ -108,7 +107,7 @@ services:
    volumes:
      - ./config/wazuh_dashboard/certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/config/certs/dashboard.pem
      - ./config/wazuh_dashboard/certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/config/certs/dashboard-key.pem
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-dashboard/config/certs/root-ca.pem
+      - ./config/wazuh_dashboard/certs/root-ca.pem:/usr/share/wazuh-dashboard/config/certs/root-ca.pem
      - wazuh-dashboard-config:/usr/share/wazuh-dashboard/config
      - wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
    depends_on:
@@ -1 +0,0 @@
-Test file for issue #7202 - upward merge test
@@ -77,8 +77,6 @@ node_to_dir() {
 # ---------------------------------------------------------------------------

 # Parse config.yml
-export WAZUH_UID=101
-export WAZUH_GID=101
 if $DO_COPY || $DO_PRIV; then
  if [ ! -f "$CONFIG_FILE" ]; then
    echo "Error: Configuration file $CONFIG_FILE not found."
@@ -104,6 +102,7 @@ if $DO_COPY; then
    echo "Copying certificates for indexer: $node -> config/$dir_name/certs/"
    mkdir -p "./config/$dir_name/certs"
    cp "$OUTPUT_DIR/${node}"* "./config/$dir_name/certs/"
+    cp "$OUTPUT_DIR"/root-ca* "./config/$dir_name/certs/"
    if $FIRST_INDEXER; then
      cp "$OUTPUT_DIR"/admin* "./config/$dir_name/certs/"
      FIRST_INDEXER=false
@@ -115,6 +114,7 @@ if $DO_COPY; then
    echo "Copying certificates for manager: $node -> config/$dir_name/certs/"
    mkdir -p "./config/$dir_name/certs"
    cp "$OUTPUT_DIR/${node}"* "./config/$dir_name/certs/"
+    cp "$OUTPUT_DIR"/root-ca* "./config/$dir_name/certs/"
  done

  for node in "${DASHBOARD_NODES[@]}"; do
@@ -122,37 +122,32 @@ if $DO_COPY; then
    echo "Copying certificates for dashboard: $node -> config/$dir_name/certs/"
    mkdir -p "./config/$dir_name/certs"
    cp "$OUTPUT_DIR/${node}"* "./config/$dir_name/certs/"
+    cp "$OUTPUT_DIR"/root-ca* "./config/$dir_name/certs/"
  done
-  echo "Copying root-ca certificates -> config/root-ca/certs/"
-  mkdir -p "./config/root-ca/certs"
-  cp "$OUTPUT_DIR"/root-ca* "./config/root-ca/certs/"
 fi

 # 3. Set ownership and permissions
 if $DO_PRIV; then
  for node in "${INDEXER_NODES[@]}"; do
    dir_name=$(node_to_dir "$node")
-    echo "Setting permissions for indexer $node (${WAZUH_UID}:${WAZUH_GID})"
-    chown -R ${WAZUH_UID}:${WAZUH_GID} "./config/$dir_name/certs"
+    echo "Setting permissions for indexer $node (1000:1000)"
+    chown -R 1000:1000 "./config/$dir_name/certs"
    chmod 400 "./config/$dir_name/certs/"*
  done

  for node in "${MANAGER_NODES[@]}"; do
    dir_name=$(node_to_dir "$node")
-    echo "Setting permissions for manager $node (${WAZUH_UID}:${WAZUH_GID})"
-    chown -R ${WAZUH_UID}:${WAZUH_GID} "./config/$dir_name/certs"
+    echo "Setting permissions for manager $node (999:999)"
+    chown -R 999:999 "./config/$dir_name/certs"
    chmod 400 "./config/$dir_name/certs/"*
  done

  for node in "${DASHBOARD_NODES[@]}"; do
    dir_name=$(node_to_dir "$node")
-    echo "Setting permissions for dashboard $node (${WAZUH_UID}:${WAZUH_GID})"
-    chown -R ${WAZUH_UID}:${WAZUH_GID} "./config/$dir_name/certs"
+    echo "Setting permissions for dashboard $node (1000:1000)"
+    chown -R 1000:1000 "./config/$dir_name/certs"
    chmod 400 "./config/$dir_name/certs/"*
  done
-  echo "Setting permissions for root-ca certificates (${WAZUH_UID}:${WAZUH_GID})"
-  chown -R ${WAZUH_UID}:${WAZUH_GID} "./config/root-ca/certs"
-  chmod 400 "./config/root-ca/certs/"*
 fi

 echo "Process completed."
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
  wazuh.agent:
-    image: wazuh/wazuh-agent:5.0.0
+    image: wazuh/wazuh-agent:5.1.0
    restart: always
    environment:
      - WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>
Author	SHA1	Message	Date
Wazuh CI	c5d833dc65	Merge pull request #2299 from wazuh/enhancement/wqa2276-bump-test_bump_main_with_set-as-main_true Bump test_bump_main_with_set-as-main_true branch	2026-04-14 22:15:31 +02:00
wazuhci	6baaf76696	feat: bump test_bump_main_with_set-as-main_true	2026-04-14 20:15:27 +00:00
				`@@ -1 +0,0 @@`
				`Test file for issue #7202 - upward merge test`