diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ac4a2c26..cc2af6a3 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -158,7 +158,6 @@ jobs:
 
     - name: Check Wazuh indexer start
       run: |
-       INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep "indexer")
        for i in {1..20}; do
         echo "Checking Wazuh indexer health (Attempt $i/20)"
          RESPONSE=$(curl -XGET "https://127.0.0.1:9200/_cluster/health?pretty" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s --retry 2 || true)
@@ -220,6 +219,15 @@ jobs:
             exit 0
           fi
 
+          INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}')
+          for CONTAINER_NAME in $INDEXER_CONTAINERS; do
+            echo ""
+            echo "========================================================="
+            echo "Container logs for $CONTAINER_NAME"
+            echo "========================================================="
+            docker logs --tail 30 "$CONTAINER_NAME"
+            echo "---------------------------------------------------------"
+          done
           echo "The index is empty or does not exist yet (Count: $DOCS). Waiting 60s"
           [ $i -lt 20 ] && sleep 60
         done
@@ -455,7 +463,15 @@ jobs:
             echo "wazuh-states index has documents: ${DOCS}"
             exit 0
           fi
-
+          INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}')
+          for CONTAINER_NAME in $INDEXER_CONTAINERS; do
+            echo ""
+            echo "========================================================="
+            echo "Container logs for $CONTAINER_NAME"
+            echo "========================================================="
+            docker logs --tail 30 "$CONTAINER_NAME"
+            echo "---------------------------------------------------------"
+          done
           echo "The index is empty or does not exist yet (Count: $DOCS). Waiting 60s"
           [ $i -lt 20 ] && sleep 60
         done