diff --git a/.github/workflows/test-native-gradle-plugin.yml b/.github/workflows/test-native-gradle-plugin.yml
index e8bc21dd7..c90cd4725 100644
--- a/.github/workflows/test-native-gradle-plugin.yml
+++ b/.github/workflows/test-native-gradle-plugin.yml
@@ -99,6 +99,7 @@ jobs:
         with:
           name: functional-tests-results-graalvm-dev
           path: native-gradle-plugin/build/reports/tests/functionalTest/
+
   functional-testing-gradle-plugin:
     name: "🧪 Gradle: ${{ matrix.test }} on ${{ matrix.os }} with gradle version: ${{ matrix.gradle-version }}"
     runs-on: ${{ matrix.os }}
@@ -124,6 +125,7 @@ jobs:
         with:
           name: functional-tests-results-${{ matrix.gradle-version }}
           path: native-gradle-plugin/build/reports/tests/functionalTest/
+          
   functional-testing-gradle-plugin-windows:
     name: "Windows Gradle plugin functional testing"
     if: ${{ false }}
diff --git a/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle b/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle
index d2a6afd58..c47ae371f 100644
--- a/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle
+++ b/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle
@@ -1,15 +1,16 @@
 import groovy.json.JsonOutput
 
-import java.nio.file.Files
-
 def matrixDefault = [
-        "gradle-version": ["current", "7.4"],
-        "gradle-config-cache-version": ["current", "8.0.1"],
-        // # Following versions are disabled temporarily in order to speed up PR testing  "7.3.3", "7.2", "7.1", "6.8.3",
         "java-version": [ "17" ],
         "os": [ "ubuntu-20.04" ]
 ]
 
+def gradleVersions = [
+        "gradle-version": ["current", "7.4"],
+        "gradle-config-cache-version": ["current", "8.0.1"]
+        // # Following versions are disabled temporarily in order to speed up PR testing  "7.3.3", "7.2", "7.1", "6.8.3",
+]
+
 sourceSets.configureEach { sourceSet ->
     if (sourceSet.name == 'functionalTest') {
         tasks.register("dumpFunctionalTestList") {
@@ -17,7 +18,16 @@ sourceSets.configureEach { sourceSet ->
                 def matrix = [
                         test: []
                 ]
+
+                // add all defaults
                 matrix.putAll(matrixDefault)
+
+                // add gradle specific stuff
+                if (project.getDisplayName().contains(":native-gradle-plugin")) {
+                    matrix.putAll(gradleVersions)
+                }
+
+                // add functional tests
                 sourceSet.allSource.each {
                     matrix.test << it.name.substring(0, it.name.lastIndexOf('.'))
                 }