diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9101b3f..ee1e45a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -49,7 +49,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRO }}
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Build app
         run: |
@@ -73,7 +73,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -82,7 +82,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRO }}
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Create distributable
         run: |
@@ -96,7 +96,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -105,7 +105,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRO }}
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Create Release for Generic Datastore
         run: |
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index eb57bbd..3c5862a 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -38,7 +38,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRO }}
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Run Lint
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1b393b0..4bafd00 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -46,7 +46,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRO }}
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Run Generic Datastore tests
         run: |
@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -74,7 +74,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRO }}
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       
       - name: Cache Kotlin/Native
         uses: actions/cache@v5
@@ -110,7 +110,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Gradle cache
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: AVD cache
         uses: actions/cache@v5