diff --git a/.github/workflows/post-pr.yml b/.github/workflows/post-pr.yml
index 553146acc1..54107475c7 100644
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@@ -285,7 +285,7 @@ jobs:
   codecov-units:
     name: Unit tests with code coverage
     needs: should-i-run
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -318,7 +318,7 @@ jobs:
       - integration-tests
       - ui-tests
       - codecov-units
-    if: always() && (needs.should-i-run.status == 'success' ) && ((needs.codecov-units.status != 'success' ) || (needs.ui-tests.status != 'success') || (needs.integration-tests.status != 'success'))
+    if: always() && (needs.should-i-run.result == 'success' ) && ((needs.codecov-units.result != 'success' ) || (needs.ui-tests.result != 'success') || (needs.integration-tests.result != 'success'))
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: michaelkaye/matrix-hookshot-action@v1.0.0
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index ea4c3d594b..6809751d91 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -71,7 +71,7 @@ jobs:
     needs:
       - sonarqube
       - codecov-units
-    if: always() && (needs.sonarqube.result != "success" || needs.codecov-units.result != "success") 
+    if: always() && (needs.sonarqube.result != 'success' || needs.codecov-units.result != 'success') 
     steps:
       - uses: michaelkaye/matrix-hookshot-action@v1.0.0
         with: