diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f76a3b18483..c7135c96eb5 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -87,10 +87,15 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
       - name: "🔨 Build project"
-        run: >
-          ./gradlew build :grails-shell-cli:installDist groovydoc
-          --continue --stacktrace -PonlyCoreTests
-          --rerun-tasks
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2 
+        with: 
+          timeout_seconds: 3600 # normal range 20-40m
+          max_attempts: 3 # Attempts to address: Connect to repository.apache.org:443 [repository.apache.org/65.109.119.155] failed: Connect timed out
+          retry_wait_seconds: 600
+          command: >
+            ./gradlew build :grails-shell-cli:installDist groovydoc
+            --continue --stacktrace -PonlyCoreTests
+            --rerun-tasks
   functional:
     name: "Functional Tests"
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
@@ -112,13 +117,18 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
       - name: "🏃 Run Functional Tests"
-        run: >
-          ./gradlew bootJar check
-          --continue --stacktrace
-          -PonlyFunctionalTests
-          -PskipHibernate5Tests
-          -PskipMongodbTests
-          --rerun-tasks
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2 
+        with: 
+          timeout_seconds: 1200 # normal range 10-12m
+          max_attempts: 3 # Attempts to address: Connect to repository.apache.org:443 [repository.apache.org/65.109.119.155] failed: Connect timed out
+          retry_wait_seconds: 600
+          command: >
+            ./gradlew bootJar check
+            --continue --stacktrace
+            -PonlyFunctionalTests
+            -PskipHibernate5Tests
+            -PskipMongodbTests
+            --rerun-tasks
   mongodbFunctional:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
     name: "Mongodb Functional Tests"
@@ -141,14 +151,19 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🏃 Run Functional Tests"
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2 
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-        run: >
-          ./gradlew bootJar cleanTest check
-          --continue --stacktrace
-          -PonlyMongodbTests
-          -PmongodbContainerVersion=${{ matrix.mongodb-version }}
-          --rerun-tasks
+        with: 
+          timeout_seconds: 1500 # normal range 15m
+          max_attempts: 3 # Attempts to address: Connect to repository.apache.org:443 [repository.apache.org/65.109.119.155] failed: Connect timed out
+          retry_wait_seconds: 600
+          command: >
+            ./gradlew bootJar cleanTest check
+            --continue --stacktrace
+            -PonlyMongodbTests
+            -PmongodbContainerVersion=${{ matrix.mongodb-version }}
+            --rerun-tasks
   hibernate5Functional:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') }}
     name: "Hibernate5 Functional Tests"
@@ -170,13 +185,18 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🏃 Run Functional Tests"
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-        run: >
-          ./gradlew bootJar cleanTest check
-          --continue --stacktrace
-          -PonlyHibernate5Tests
-          --rerun-tasks
+        with: 
+          timeout_seconds: 1200 # normal range 10-12m
+          max_attempts: 3 # Attempts to address: Connect to repository.apache.org:443 [repository.apache.org/65.109.119.155] failed: Connect timed out
+          retry_wait_seconds: 600
+          command: >
+            ./gradlew bootJar cleanTest check
+            --continue --stacktrace
+            -PonlyHibernate5Tests
+            --rerun-tasks
   publishGradle:
     if: github.repository_owner == 'apache' && github.event_name == 'push'
     needs: [ buildGradle ]
diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
index 0c30fe75c8c..e09fa0219d0 100644
--- a/.github/workflows/groovy-joint-workflow.yml
+++ b/.github/workflows/groovy-joint-workflow.yml
@@ -158,6 +158,11 @@ jobs:
         run: |
           sed -i "/['\"]groovy\.version['\"][[:space:]]*:/c\'groovy.version':'${{ needs.build_groovy.outputs.groovyVersion }}'," dependencies.gradle
       - name: "🔨 Build and test Grails using the locally built Groovy snapshot"
-        run: >
-          ./gradlew build
-          -x groovydoc
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2 
+        with: 
+          timeout_seconds: 2700 # normal range 10-30m
+          max_attempts: 3 # Attempts to address: Connect to repository.apache.org:443 [repository.apache.org/65.109.119.155] failed: Connect timed out
+          retry_wait_seconds: 600
+          command: >
+            ./gradlew build
+            -x groovydoc