diff --git a/.github/multi-node-fb-check.sh b/.github/multi-node-fb-check.sh
index 7c0d1abd..36b9686e 100755
--- a/.github/multi-node-fb-check.sh
+++ b/.github/multi-node-fb-check.sh
@@ -1,5 +1,5 @@
 fbout1=$(docker exec multi-node_wazuh.master_1 sh -c 'filebeat test output')
-fbstatus1=$(echo "${fbout1}" | grep OK | wc -l)
+fbstatus1=$(echo "${fbout1}" | grep -c OK)
 if [[ fbstatus1 -eq 7 ]]; then
  echo "No errors in master filebeat"
 else
@@ -8,7 +8,7 @@ else
  exit 1
 fi
 fbout2=$(docker exec multi-node_wazuh.worker_1 sh -c 'filebeat test output')
-fbstatus2=$(echo "${fbout2}" | grep OK | wc -l)
+fbstatus2=$(echo "${fbout2}" | grep -c OK)
 if [[ fbstatus2 -eq 7 ]]; then
  echo "No errors in worker filebeat"
 else
diff --git a/.github/single-node-fb-check.sh b/.github/single-node-fb-check.sh
index dffaa75b..47e21dd1 100755
--- a/.github/single-node-fb-check.sh
+++ b/.github/single-node-fb-check.sh
@@ -1,5 +1,5 @@
 fbout=$(docker exec single-node_wazuh.manager_1 sh -c 'filebeat test output')
-fbstatus=$(echo "${fbout}" | grep OK | wc -l)
+fbstatus=$(echo "${fbout}" | grep -c OK)
 if [[ fbstatus -eq 7 ]]; then
   echo "No errors in filebeat"
 else
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cad603a5..14d02acc 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,6 +1,6 @@
 name: Wazuh Docker pipeline
 
-on: [pull_request, push]
+on: [pull_request]
 
 jobs:
   build-stack:
@@ -10,22 +10,22 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v3
 
-   # - name: Build Wazuh images
-   #   run: build-docker-images/build-images.sh
+    - name: Build Wazuh images
+      run: build-docker-images/build-images.sh
 
     - name: Create enviroment variables
       run: cat .env > $GITHUB_ENV
 
-   # - name: Install Goss
-   #   uses: e1himself/goss-installation-action@v1.0.3
-   #   with:
-   #     version: v0.3.16
+    - name: Install Goss
+      uses: e1himself/goss-installation-action@v1.0.3
+      with:
+        version: v0.3.16
 
-   # - name: Execute Goss tests (wazuh-manager)
-   #   run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
-   #   env:
-   #     GOSS_SLEEP: 30
-   #     GOSS_FILE: .github/.goss.yaml
+    - name: Execute Goss tests (wazuh-manager)
+      run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
+      env:
+        GOSS_SLEEP: 30
+        GOSS_FILE: .github/.goss.yaml
 
     - name: Create single node certficates
       run: docker-compose -f single-node/generate-indexer-certs.yml run --rm generator