diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0fde3c3..ae44beef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,30 +67,19 @@ jobs:
   #      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/master'
   #      run: |
   #        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/owgw | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
-
-  #  trigger-testing:
-  #    if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/')
-  #    runs-on: ubuntu-latest
-  #    needs: docker
-  #    steps:
-  #    - name: Trigger testing of OpenWifi Docker Compose deployment
-  #      uses: peter-evans/repository-dispatch@v1
-  #      with:
-  #        token: ${{ secrets.WLAN_TESTING_PAT }}
-  #        repository: Telecominfraproject/wlan-testing
-  #        event-type: openwifi-sdk-pr
-  #        client-payload: '{"owgw_tag": "${{ github.sha }}", "owgwui_tag": "main", "owsec_tag": "main", "owfms_tag": "main", "owprov_tag": "main", "owprovui_tag": "main"}'
-
+  #
   trigger-testing:
     if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/')
     runs-on: ubuntu-latest
-    env:
-      WLAN_TESTING_PAT: ${{ secrets.WLAN_TESTING_PAT }}
+#    needs: docker
     steps:
-    - name: Check Github API response with manual curl request
-      run: |
-        curl -i -X POST \
-          -H "Accept: application/vnd.github.v3+json" \
-          -H "Authorization: token $WLAN_TESTING_PAT" \
-          --data '{"event_type": "openwifi-sdk-pr", "client_payload": {"owgw_tag": "master", "owgwui_tag": "main", "owsec_tag": "main", "owfms_tag": "main", "owprov_tag": "main", "owprovui_tag": "main"}}' \
-          https://api.github.com/repos/${{ github.repository_owner }}/wlan-testing/dispatches
+    - name: Trigger testing of OpenWifi Docker Compose deployment and wait for result
+      uses: felixp8/dispatch-and-wait@v0.1.0
+      with:
+        token: ${{ secrets.WLAN_TESTING_PAT }}
+        repo: wlan-testing
+        owner: Telecominfraproject
+        event-type: openwifi-sdk-pr
+        client-payload: '{"owgw_tag": "356e97b8565027cf63b3508b44f39f437dbde059", "owgwui_tag": "main", "owsec_tag": "main", "owfms_tag": "main", "owprov_tag": "main", "owprovui_tag": "main"}'
+        wait_time: 60 
+        max_time: 2700