diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index 1c6294c..1f2f1f1 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -92,7 +92,7 @@ jobs:
   post_dev_deploy_tests:
     needs: dev_deploy
     concurrency:
-      group: 'fsd-preaward-test-dev'
+      group: 'fsd-preaward-dev'
       cancel-in-progress: false
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
@@ -118,8 +118,9 @@ jobs:
 
   post_test_deploy_tests:
     needs: test_deploy
+    if: ${{ always() && contains(fromJSON(needs.setup.outputs.jobs_to_run), 'test') && (! contains(needs.*.result, 'failure') ) && (! contains(needs.*.result, 'cancelled') )}}
     concurrency:
-      group: 'fsd-preaward-test-test'
+      group: 'fsd-preaward-test'
       cancel-in-progress: false
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
@@ -145,8 +146,9 @@ jobs:
 
   post_uat_deploy_tests:
     needs: uat_deploy
+    if: ${{ always() && contains(fromJSON(needs.setup.outputs.jobs_to_run), 'uat') && (! contains(needs.*.result, 'failure') ) && (! contains(needs.*.result, 'cancelled') )}}
     concurrency:
-      group: 'fsd-preaward-test-uat'
+      group: 'fsd-preaward-uat'
       cancel-in-progress: false
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}