diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 782ae6e91..ec7125160 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -1,6 +1,6 @@
 name: Fineract Docker build
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b7887a5a..0c45d5869 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,10 @@
 name: Fineract Gradle build
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+  # We need 18.04 for this - the 20.04 image contains MySQL 8.0, and the GitHub Action to install 5.7 is not permitted in the Apache repo.
+    runs-on: ubuntu-18.04
     env:
         TZ: Asia/Kolkata
     steps:
@@ -25,11 +26,10 @@ jobs:
           distribution: 'zulu'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Set up MySQL 5.7
-        uses: mirromutth/mysql-action@v1.1
-        with:
-          mysql version: '5.7'
-          mysql root password: 'mysql'
+      - name: Start up MySQL 5.7
+        run: |
+          sudo /etc/init.d/mysql start
+          echo "USE mysql;\nALTER USER 'root'@'localhost' IDENTIFIED BY 'mysql';\n" | mysql -u root -proot
       - name: Initialise databases
         run: |
             ./gradlew --no-daemon -q createDB -PdbName=fineract_tenants
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index c186d0543..f275a5c48 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -1,5 +1,5 @@
 name: Fineract Sonarqube
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -8,7 +8,7 @@ jobs:
         TZ: Asia/Kolkata
         SONAR_ORGANIZATION: apache
         SONAR_HOST_URL: https://sonarcloud.io
-        SONAR_TOKEN: "Q2E9ijK+9+R6nkb9o2FQrKUiAozp0325mlGfM25rGV3mCRPyWR/lU8o48r2eaBEX8SEvMvXIO3XXD9SPyUX2+svLz0MOMdfZfNveg6jmcHNRjkzzBK0bMIIGbEH/YqJ+psl4nDmlDd6IK4685/1JSRUJLqeKKK2ulixm6PXcmwZWeKD6TjyXsW50zz3yYIOuROHzys/M6H05h1dZD3j6ztnRsjbr7SmqFEVWSRgEd/aAs+HZB9Fv1xN66csRoQUQKgzoBO9egAQcel65Av0Bf+pOQuzVDVyXNohZEYia02MCGlC6OFvtL7xIXGf/vo02RdnlN4Jnma6P37TaNrmpk2e+EGJaZHmL9cb98+Zc39uPb7qEZkMfDdKrW6QVRtScSuCJzpY58WRgTS0jLCxsDBAMfsrIvWbHntFZL9q5aEkFgecj0pg9u6WHxgA8cuPUY5QzHQo9fEUxNJHGJHQ2FkafLniqJp7DVbsyQHmEggaTrGGrketeYvCbSR1oOnBgImUwzjIV9/zOdd10Wzi8x9HsmzrGBPSBaO4fBxjC1LZwdyue2a2+oKvBqpAGcLpGaCRfHTh2yPXhZW4bw11rOmQxgtOQVBXhveciWAUQuVXIak+RZnu/zRvnul9sZ6bb1hEUPkpUypk+FDeLm8T7y2A++u/jBam2vLc0iff5xtA="
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     steps:
       - name: Set up cache
         uses: actions/cache@v2