diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index a04b0021e..8a7f7a0bb 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.github/workflows/maven-ci.yml
@@ -41,7 +41,7 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - uses: actions/cache@v1
+    - uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml
index 0384c326c..1bdad0621 100644
--- a/.github/workflows/maven-pr-builder.yml
+++ b/.github/workflows/maven-pr-builder.yml
@@ -41,7 +41,7 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - uses: actions/cache@v1
+    - uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,10 +55,3 @@ jobs:
     - name: Build with Maven
       if: github.ref != 'refs/heads/master'
       run: xvfb-run mvn clean verify
-    - name: Build with Maven and run SonarQube analysis
-      if: github.ref == 'refs/heads/master'
-      run: xvfb-run mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-      env:
-        # These two env variables are needed for sonar analysis
-        GITHUB_TOKEN: ${{ secrets.REPOSITORY_ACCESS_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}