diff --git a/.github/actions/setup-vro/action.yml b/.github/actions/setup-vro/action.yml
index 2b502ae74..b572ced28 100644
--- a/.github/actions/setup-vro/action.yml
+++ b/.github/actions/setup-vro/action.yml
@@ -15,16 +15,9 @@ runs:
         # cache the Gradle User Home"
         # cache: 'gradle'
 
-    # https://github.com/gradle/actions/blob/v3.5.0/setup-gradle/action.yml
-    - name: "Setup Gradle"
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        # Only write to the cache for builds on the 'main' and 'develop' branches. (Default is 'main' only.)
-        # Builds on other branches will only read existing entries from the cache.
-        cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/qa' && github.ref != 'refs/heads/develop' }}
-        # To avoid a growing cache over time, attempt to delete any files in the Gradle User Home
-        # that were not used by Gradle during the workflow, prior to saving the cache.
-        gradle-home-cache-cleanup: true
+    - name: "Clear Gradle Cache"
+      shell: bash
+      run: rm -rf ~/.gradle || true
 
     - uses: ./.github/actions/install-java-tools
 
diff --git a/.github/workflows/secrel.yml b/.github/workflows/secrel.yml
index 9e60cd191..e21e21c5e 100644
--- a/.github/workflows/secrel.yml
+++ b/.github/workflows/secrel.yml
@@ -68,7 +68,7 @@ jobs:
     outputs:
       run-secrel: ${{ steps.check-run-conds.outputs.run_secrel }}
       publish-images: ${{ steps.check-run-conds.outputs.publish_images }}
-    runs-on: ubuntu-20.04 # NOTE: As VRO is being shut down, this version is pinned to get around a .gradle issue with removeUnusedEntriesOlderThan.
+    runs-on: ubuntu-latest
     steps:
       - name: "Decide downstream actions"
         id: check-run-conds
@@ -106,7 +106,7 @@ jobs:
     outputs:
       vro-images: ${{ steps.publish-images.outputs.images_list }}
       slack-response-ts: ${{ fromJson(steps.notify-slack.outputs.slack-result).response.message.ts }}
-    runs-on: ubuntu-20.04 # NOTE: As VRO is being shut down, this version is pinned to get around a .gradle issue with removeUnusedEntriesOlderThan.
+    runs-on: ubuntu-latest
     steps:
       - name: "Determine image tag"
         id: image-props