diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 9d93d719..8203e8a7 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -15,6 +15,9 @@ inputs:
   scala-compat-version:
     description: Scala compatibility version, e.g. 2.12
     required: true
+  java-version:
+    description: Java version, e.g. 11
+    required: true
 
 runs:
   using: 'composite'
@@ -32,10 +35,10 @@ runs:
         key: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-compat-version }}-${{ hashFiles('pom.xml') }}
         restore-keys: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-compat-version }}-
 
-    - name: Setup JDK 1.11
+    - name: Setup JDK
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: ${{ inputs.java-version }}
         distribution: 'zulu'
 
     - name: Build
diff --git a/.github/actions/test-scala/action.yml b/.github/actions/test-scala/action.yml
index 203bb1b1..7e61a216 100644
--- a/.github/actions/test-scala/action.yml
+++ b/.github/actions/test-scala/action.yml
@@ -15,6 +15,9 @@ inputs:
   scala-compat-version:
     description: Scala compatibility version, e.g. 2.12
     required: true
+  java-version:
+    description: Java version, e.g. 11
+    required: true
   dgraph-version:
     description: Dgraph server version, e.g. 22.0.0
     required: true
@@ -43,10 +46,10 @@ runs:
           ${{ runner.os }}-mvn-test-${{ inputs.spark-version }}-${{ inputs.scala-compat-version }}-
           ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-compat-version }}-
 
-    - name: Setup JDK 11
+    - name: Setup JDK
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: ${{ inputs.java-version }}
         distribution: 'zulu'
 
     - name: Start Dgraph cluster
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e1f2b15..6c4af7dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,47 +16,58 @@ jobs:
             spark-version: '3.0.3'
             scala-compat-version: '2.12'
             scala-version: '2.12.10'
+            java-version: 11
           - spark-compat-version: '3.1'
             spark-version: '3.1.3'
             scala-compat-version: '2.12'
             scala-version: '2.12.10'
+            java-version: 11
           - spark-compat-version: '3.2'
             spark-version: '3.2.4'
             scala-compat-version: '2.12'
             scala-version: '2.12.15'
+            java-version: 11
           - spark-compat-version: '3.3'
             spark-version: '3.3.4'
             scala-compat-version: '2.12'
             scala-version: '2.12.15'
+            java-version: 11
           - spark-compat-version: '3.4'
             spark-version: '3.4.3'
             scala-compat-version: '2.12'
             scala-version: '2.12.17'
+            java-version: 11
           - spark-compat-version: '3.5'
             spark-version: '3.5.3'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
+            java-version: 11
 
           - spark-compat-version: '3.2'
             spark-version: '3.2.4'
             scala-compat-version: '2.13'
             scala-version: '2.13.5'
+            java-version: 11
           - spark-compat-version: '3.3'
             spark-version: '3.3.4'
             scala-compat-version: '2.13'
             scala-version: '2.13.8'
+            java-version: 11
           - spark-compat-version: '3.4'
             spark-version: '3.4.3'
             scala-compat-version: '2.13'
             scala-version: '2.13.8'
+            java-version: 11
           - spark-compat-version: '3.5'
             spark-version: '3.5.3'
             scala-compat-version: '2.13'
             scala-version: '2.13.8'
+            java-version: 11
           - spark-compat-version: '4.0'
             spark-version: '4.0.0-preview2'
             scala-compat-version: '2.13'
             scala-version: '2.13.14'
+            java-version: 21
 
     steps:
       - name: Checkout
@@ -69,4 +80,5 @@ jobs:
           scala-version: ${{ matrix.scala-version }}
           spark-compat-version: ${{ matrix.spark-compat-version }}
           scala-compat-version: ${{ matrix.scala-compat-version }}
+          java-version: ${{ matrix.java-version }}
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa6a7465..f5906dbf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,6 +91,7 @@ jobs:
               "spark-compat-version": "3.2",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.5",
+              "java-version": "11",
               "dgraph-version": "24.0.2"
             },
             {
@@ -98,6 +99,7 @@ jobs:
               "spark-compat-version": "3.3",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.8",
+              "java-version": "11",
               "dgraph-version": "24.0.2"
             },
             {
@@ -105,6 +107,7 @@ jobs:
               "spark-compat-version": "3.4",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.8",
+              "java-version": "11",
               "dgraph-version": "24.0.2"
             },
             {
@@ -112,6 +115,7 @@ jobs:
               "spark-compat-version": "3.5",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.8",
+              "java-version": "11",
               "dgraph-version": "24.0.2"
             },
             {
@@ -119,6 +123,7 @@ jobs:
               "spark-compat-version": "4.0",
               "scala-compat-version": "2.13",
               "scala-version": "2.13.14",
+              "java-version": "21",
               "dgraph-version": "24.0.2"
             }
           ]
diff --git a/.github/workflows/test-dgraph.yml b/.github/workflows/test-dgraph.yml
index 283c349e..12268e37 100644
--- a/.github/workflows/test-dgraph.yml
+++ b/.github/workflows/test-dgraph.yml
@@ -40,5 +40,6 @@ jobs:
           scala-version: ${{ matrix.scala-version }}
           spark-compat-version: ${{ matrix.spark-compat-version }}
           scala-compat-version: ${{ matrix.scala-compat-version }}
+          java-version: 11
           dgraph-version: ${{ matrix.dgraph-version }}
 
diff --git a/.github/workflows/test-scala.yml b/.github/workflows/test-scala.yml
index 9fb1f109..168b6286 100644
--- a/.github/workflows/test-scala.yml
+++ b/.github/workflows/test-scala.yml
@@ -27,5 +27,6 @@ jobs:
           scala-version: ${{ matrix.scala-version }}
           spark-compat-version: ${{ matrix.spark-compat-version }}
           scala-compat-version: ${{ matrix.scala-compat-version }}
+          java-version: ${{ matrix.java-version }}
           dgraph-version: ${{ matrix.dgraph-version }}
 
diff --git a/.github/workflows/test-spark.yml b/.github/workflows/test-spark.yml
index f2e49a3a..31b858f3 100644
--- a/.github/workflows/test-spark.yml
+++ b/.github/workflows/test-spark.yml
@@ -27,54 +27,63 @@ jobs:
             "3.5.0", "3.5.1",
             "4.0.0-preview2"
         ]
-        scala-compat-version: ["2.12"]
         include:
           - spark-version: "3.0.3"
             spark-compat-version: "3.0"
             scala-compat-version: "2.12"
             scala-version: "2.12.10"
+            java-version: 11
 
           - spark-version: "3.1.3"
             spark-compat-version: "3.1"
             scala-compat-version: "2.12"
             scala-version: "2.12.10"
+            java-version: 11
 
           - spark-version: "3.2.4"
             spark-compat-version: "3.2"
             scala-compat-version: "2.12"
             scala-version: "2.12.15"
+            java-version: 11
 
           - spark-version: "3.3.4"
             spark-compat-version: "3.3"
             scala-compat-version: "2.12"
             scala-version: "2.12.15"
+            java-version: 11
 
           - spark-version: "3.4.0"
             spark-compat-version: "3.4"
             scala-compat-version: "2.12"
             scala-version: "2.12.17"
+            java-version: 11
           - spark-version: "3.4.1"
             spark-compat-version: "3.4"
             scala-compat-version: "2.12"
             scala-version: "2.12.17"
+            java-version: 11
           - spark-version: "3.4.2"
             spark-compat-version: "3.4"
             scala-compat-version: "2.12"
             scala-version: "2.12.17"
+            java-version: 11
 
           - spark-version: "3.5.0"
             spark-compat-version: "3.5"
             scala-compat-version: "2.12"
             scala-version: "2.12.18"
+            java-version: 11
           - spark-version: "3.5.1"
             spark-compat-version: "3.5"
             scala-compat-version: "2.12"
             scala-version: "2.12.18"
+            java-version: 11
 
           - spark-version: "4.0.0-preview2"
             spark-compat-version: "4.0"
             scala-compat-version: "2.13"
             scala-version: "2.13.14"
+            java-version: 21
 
     steps:
       - name: Checkout
@@ -87,5 +96,6 @@ jobs:
           scala-version: ${{ matrix.scala-version }}
           spark-compat-version: ${{ matrix.spark-compat-version }}
           scala-compat-version: ${{ matrix.scala-compat-version }}
+          java-version: ${{ matrix.java-version }}
           dgraph-version: ${{ inputs.dgraph-version }}