diff --git a/.github/workflows/gradle-compatibility.yml b/.github/workflows/gradle-compatibility.yml
index 892f053f..2900c19a 100644
--- a/.github/workflows/gradle-compatibility.yml
+++ b/.github/workflows/gradle-compatibility.yml
@@ -1,6 +1,6 @@
 name: Gradle Compatibility Check
 
-on: [push]
+on: [ push ]
 
 jobs:
   gradle-compatibility-builds:
@@ -9,38 +9,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        agp-version: ["6.1.1", "7.4.0", "8.3.1"]
-        include:
-          - agp-version: "6.1.1"
-            gradle-version: "6.8"
-            sample-app: "java_layout"
+        sample-app:
+          - sample-app: "java_layout"
             cio-siteid-secret-key: "CUSTOMERIO_JAVA_WORKSPACE_SITE_ID"
             cio-apikey-secret-key: "CUSTOMERIO_JAVA_WORKSPACE_API_KEY"
-          - agp-version: "6.1.1"
-            gradle-version: "6.8"
-            sample-app: "kotlin_compose"
-            cio-siteid-secret-key: "CUSTOMERIO_KOTLIN_WORKSPACE_SITE_ID"
-            cio-apikey-secret-key: "CUSTOMERIO_KOTLIN_WORKSPACE_API_KEY"
-          - agp-version: "7.4.0"
-            gradle-version: "7.2"
-            sample-app: "java_layout"
-            cio-siteid-secret-key: "CUSTOMERIO_JAVA_WORKSPACE_SITE_ID"
-            cio-apikey-secret-key: "CUSTOMERIO_JAVA_WORKSPACE_API_KEY"
-          - agp-version: "7.4.0"
-            gradle-version: "7.2"
-            sample-app: "kotlin_compose"
+          - sample-app: "kotlin_compose"
             cio-siteid-secret-key: "CUSTOMERIO_KOTLIN_WORKSPACE_SITE_ID"
             cio-apikey-secret-key: "CUSTOMERIO_KOTLIN_WORKSPACE_API_KEY"
+        agp-version:
+          - agp-version: "7.2.0"
+            gradle-plugin-version: "6.8"
+            java-version: "6.8"
+            kotlin-jvm-version: "JavaVersion.VERSION_1_8"
+            apk-scale-version: "1.8"
+            packaging-resources-action: "packagingOptions"
           - agp-version: "8.3.1"
-            gradle-version: "8.4"
-            sample-app: "java_layout"
-            cio-siteid-secret-key: "CUSTOMERIO_JAVA_WORKSPACE_SITE_ID"
-            cio-apikey-secret-key: "CUSTOMERIO_JAVA_WORKSPACE_API_KEY"
-          - agp-version: "8.3.1"
-            gradle-version: "8.4"
-            sample-app: "kotlin_compose"
-            cio-siteid-secret-key: "CUSTOMERIO_KOTLIN_WORKSPACE_SITE_ID"
-            cio-apikey-secret-key: "CUSTOMERIO_KOTLIN_WORKSPACE_API_KEY"
+            # We don't need to specify further versions here, as we'll use the default values for actual gradle versions.
 
     steps:
       - uses: actions/checkout@v4
@@ -79,7 +63,18 @@ jobs:
 
       - name: Update Gradle Wrapper
         run: |
-          sed -i "s/gradle-.*-all.zip/gradle-${{ matrix.gradle-version }}-all.zip/g" gradle/wrapper/gradle-wrapper.properties
+          # If AGP version matches the default value, we don't need to specify further versions.
+          if [ "${{ matrix.config }}" = "8.3.1" ]; then
+          ./scripts/update-gradle-compatibility.sh
+          else
+          ./scripts/update-gradle-compatibility.sh \
+          --agpVersion ${{ matrix.gradle-version }} \
+          --gradlePluginVersion ${{ matrix.gradle-version }} \
+          --javaVersion ${{ matrix.gradle-version }} \
+          --kotlinJVMVersion ${{ matrix.gradle-version }} \
+          --apkScaleVersion ${{ matrix.gradle-version }} \
+          --packagingResourcesAction ${{ matrix.gradle-version }}
+          fi
 
       - name: Build Sample App ${{ matrix.sample-app }} with Gradle Version ${{ matrix.gradle-version }}
         run: gradle assembleRelease
diff --git a/scripts/update-gradle-compatibility.sh b/scripts/update-gradle-compatibility.sh
index f8db3396..7e9b7fef 100755
--- a/scripts/update-gradle-compatibility.sh
+++ b/scripts/update-gradle-compatibility.sh
@@ -1,12 +1,23 @@
 #!/bin/sh
 
-# Script that update files required for the Android Gradle Plugin version update.
+# Script that update files required for the Android Gradle Plugin version compatibility.
 #
 # Usage:
-# ./scripts/update-gradle-compatibility.sh --agpVersion <new_agp_version> --gradlePluginVersion <new_gradle_plugin_version>
-# --javaVersion <new_java_version> --kotlinJVMVersion <new_kotlin_jvm_version> --apkScaleVersion <new_apk_scale_version>
-# --packagingResourcesAction <packaging_resources_action>
-# ./scripts/update-gradle-compatibility.sh --agpVersion "7.2.0" --gradlePluginVersion "7.6.4" --javaVersion "JavaVersion.VERSION_1_8" --kotlinJVMVersion "1.8" --apkScaleVersion "0.1.4" --packagingResourcesAction "packagingOptions"
+# ./scripts/update-gradle-compatibility.sh
+#   --agpVersion <new_agp_version>
+#   --gradlePluginVersion <new_gradle_plugin_version>
+#   --javaVersion <new_java_version>
+#   --kotlinJVMVersion <new_kotlin_jvm_version>
+#   --apkScaleVersion <new_apk_scale_version>
+#   --packagingResourcesAction <packaging_resources_action>
+# Example:
+# ./scripts/update-gradle-compatibility.sh
+#   --agpVersion 7.2.0
+#   --gradlePluginVersion 7.6.4
+#   --javaVersion JavaVersion.VERSION_1_8
+#   --kotlinJVMVersion 1.8
+#   --apkScaleVersion 0.1.4
+#   --packagingResourcesAction packagingOptions
 
 set -e