diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c114de14..2d55ef84 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -93,6 +93,7 @@ jobs:
   build:
     name: ${{ matrix.component.name }} Image Build
     needs: [prepare]
+    if: needs.prepare.outputs.components != '' && needs.prepare.outputs.components != 'null' && needs.prepare.outputs.components != '[]'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -147,3 +148,25 @@ jobs:
           package-type: 'container'
           package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }}
         if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete != '' }}
+  services-build-status:
+    name: "Services Build Status"
+    runs-on: ubuntu-latest
+    needs: [prepare, build]
+    if: always()
+    steps:
+      - name: Check build status
+        run: |
+          if [[ "${{ needs.prepare.result }}" == "failure" || "${{ needs.prepare.result }}" == "cancelled" ]]; then
+            echo "Prepare job failed or was cancelled"
+            exit 1
+          fi
+          if [[ "${{ needs.build.result }}" == "failure" || "${{ needs.build.result }}" == "cancelled" ]]; then
+            echo "Build job failed or was cancelled"
+            exit 1
+          fi
+          if [[ "${{ needs.build.result }}" == "skipped" ]]; then
+            echo "Build job was skipped - this is OK"
+            exit 0
+          fi
+          echo "All builds completed successfully!"
+          exit 0
diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
index 65f51dec..649dd46d 100644
--- a/.github/workflows/run_tests.yaml
+++ b/.github/workflows/run_tests.yaml
@@ -28,11 +28,11 @@ jobs:
   Pgskipper-Pipeline:
     if: ${{ github.actor != 'dependabot[bot]' && github.event.pull_request.user.login != 'dependabot[bot]' }}
     needs: Wait-for-images
-    uses: Netcracker/qubership-test-pipelines/.github/workflows/pgskipper.yaml@acf44dc8f22430d11eb93a679bf54e99b69ee6a2 #v1.5.0
+    uses: Netcracker/qubership-test-pipelines/.github/workflows/pgskipper.yaml@a23bed13d489e8fe6e335fe717258dea12cbb006 #v1.6.0
     with:
       repository_name: ${{ github.repository }}
       service_branch: '${{ github.head_ref || github.ref_name }}'
-      pipeline_branch: 'acf44dc8f22430d11eb93a679bf54e99b69ee6a2' #this value must match the value after '@' in 'uses'
+      pipeline_branch: 'a23bed13d489e8fe6e335fe717258dea12cbb006' #this value must match the value after '@' in 'uses'
     secrets:
       AWS_S3_ACCESS_KEY_ID: ${{secrets.AWS_S3_ACCESS_KEY_ID}}
       AWS_S3_ACCESS_KEY_SECRET: ${{secrets.AWS_S3_ACCESS_KEY_SECRET}}
@@ -48,4 +48,3 @@ jobs:
             exit 1
           fi
           echo "All tests completed successfully or not required"
-