diff --git a/.github/actions/create-bwc-build/action.yaml b/.github/actions/create-bwc-build/action.yaml
index 25a348bcc0..0f3661c7ac 100644
--- a/.github/actions/create-bwc-build/action.yaml
+++ b/.github/actions/create-bwc-build/action.yaml
@@ -33,9 +33,8 @@ runs:
         path: ${{ inputs.plugin-branch }}
 
     - name: Build
-      uses: gradle/gradle-build-action@v2
+      uses: burrunan/gradle-cache-action@v1
       with:
-        cache-disabled: true
         arguments: assemble
         build-root-directory: ${{ inputs.plugin-branch }}
 
diff --git a/.github/actions/run-bwc-suite/action.yaml b/.github/actions/run-bwc-suite/action.yaml
index 6e6a17fb3f..4eeeeea9fe 100644
--- a/.github/actions/run-bwc-suite/action.yaml
+++ b/.github/actions/run-bwc-suite/action.yaml
@@ -37,9 +37,8 @@ runs:
         plugin-branch: ${{ inputs.plugin-next-branch }}
 
     - name: Run BWC tests
-      uses: gradle/gradle-build-action@v2
+      uses: burrunan/gradle-cache-action@v1
       with:
-        cache-disabled: true
         arguments: |
           bwcTestSuite
           -Dtests.security.manager=false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73d1f12f4c..1a0a15838c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,9 +54,8 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Build and Test
-      uses: gradle/gradle-build-action@v2
+      uses: burrunan/gradle-cache-action@v1
       with:
-        cache-disabled: true
         arguments: |
           ${{ matrix.gradle_task }} -Dbuild.snapshot=false
 
@@ -102,11 +101,10 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Build and Test
-      uses: gradle/gradle-build-action@v2
+      uses: burrunan/gradle-cache-action@v1
+      continue-on-error: true # Until retries are enable do not fail the workflow https://github.com/opensearch-project/security/issues/2184
       with:
-        cache-disabled: true
-        arguments: |
-          integrationTest -Dbuild.snapshot=false
+        arguments: integrationTest -Dbuild.snapshot=false
 
   resource-tests:
     env:
diff --git a/.github/workflows/code-hygiene.yml b/.github/workflows/code-hygiene.yml
index 1b46c65a63..173aa9bc97 100644
--- a/.github/workflows/code-hygiene.yml
+++ b/.github/workflows/code-hygiene.yml
@@ -24,9 +24,8 @@ jobs:
           distribution: temurin # Temurin is a distribution of adoptium
           java-version: 11
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: burrunan/gradle-cache-action@v1
         with:
-          cache-disabled: true
           arguments: spotlessCheck
 
   checkstyle:
@@ -40,9 +39,8 @@ jobs:
           distribution: temurin # Temurin is a distribution of adoptium
           java-version: 11
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: burrunan/gradle-cache-action@v1
         with:
-          cache-disabled: true
           arguments: checkstyleMain checkstyleTest checkstyleIntegrationTest
 
   spotbugs:
@@ -56,9 +54,8 @@ jobs:
           distribution: temurin # Temurin is a distribution of adoptium
           java-version: 11
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: burrunan/gradle-cache-action@v1
         with:
-          cache-disabled: true
           arguments: spotbugsMain
 
   check-permissions-order:
diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml
index 39901689be..ea1a01db1c 100644
--- a/.github/workflows/plugin_install.yml
+++ b/.github/workflows/plugin_install.yml
@@ -29,9 +29,8 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Assemble target plugin
-        uses: gradle/gradle-build-action@v2
+        uses: burrunan/gradle-cache-action@v1
         with:
-          cache-disabled: true
           arguments: assemble
 
       # Move and rename the plugin for installation
@@ -63,7 +62,6 @@ jobs:
           admin-password: ${{ steps.random-password.outputs.generated_name }}
 
       - name: Run sanity tests
-        uses: gradle/gradle-build-action@v2
+        uses: burrunan/gradle-cache-action@v1
         with:
-          cache-disabled: true
-          arguments: integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="opensearch" -Dhttps=true -Duser=admin -Dpassword=${{ steps.random-password.outputs.generated_name }} -i
+          arguments: integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="opensearch" -Dhttps=true -Duser=admin -Dpassword=-Dpassword=${{ steps.random-password.outputs.generated_name }}