diff --git a/.github/workflows/build-multi-arch-pinot-docker-image.yml b/.github/workflows/build-multi-arch-pinot-docker-image.yml
index e3314bec9c12..eb82c310a3d9 100644
--- a/.github/workflows/build-multi-arch-pinot-docker-image.yml
+++ b/.github/workflows/build-multi-arch-pinot-docker-image.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       matrix:
         arch: [ "amd64", "arm64" ]
-        base-image-tag: [ "11-amazoncorretto", "11-ms-openjdk" ]
+        base-image-tag: [ "21-amazoncorretto", "21-ms-openjdk" ]
     name: Build Pinot Docker Image on ${{ matrix.arch }} with base image ${{ matrix.base-image-tag }}
     needs: [ generate-build-info ]
     steps:
@@ -104,5 +104,5 @@ jobs:
         env:
           TAGS: "${{needs.generate-build-info.outputs.tags}}"
           BUILD_PLATFORM: "linux/arm64,linux/amd64"
-          BASE_IMAGE_TAGS: "11-amazoncorretto,11-ms-openjdk"
+          BASE_IMAGE_TAGS: "21-amazoncorretto,21-ms-openjdk"
         run: .github/workflows/scripts/docker/.pinot_multi_arch_docker_image_manifest_package.sh
diff --git a/.github/workflows/build-pinot-base-docker-image.yml b/.github/workflows/build-pinot-base-docker-image.yml
index e079fde1c304..03fb32d5dd99 100644
--- a/.github/workflows/build-pinot-base-docker-image.yml
+++ b/.github/workflows/build-pinot-base-docker-image.yml
@@ -46,5 +46,5 @@ jobs:
           OPEN_JDK_DIST: ${{ matrix.openJdkDist }}
           BASE_IMAGE_TYPE: ${{ matrix.baseImageType }}
           BUILD_PLATFORM: "linux/amd64,linux/arm64"
-          TAG: "11-${{ matrix.openJdkDist }}"
+          TAG: "21-${{ matrix.openJdkDist }}"
         run: .github/workflows/scripts/docker/.pinot_base_docker_image_build_and_push.sh
diff --git a/.github/workflows/pinot_compatibility_tests.yml b/.github/workflows/pinot_compatibility_tests.yml
index a2a2bf9dd16b..285d7c6ecbbb 100644
--- a/.github/workflows/pinot_compatibility_tests.yml
+++ b/.github/workflows/pinot_compatibility_tests.yml
@@ -37,10 +37,10 @@ jobs:
     name: Pinot Compatibility Regression Testing against ${{ github.event.inputs.oldCommit }} and ${{ github.event.inputs.newCommit }} on ${{ matrix.test_suite }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Setup node
diff --git a/.github/workflows/pinot_multi_stage_query_engine_compatibility_tests.yml b/.github/workflows/pinot_multi_stage_query_engine_compatibility_tests.yml
index fc5c337ca054..01f6f5126981 100644
--- a/.github/workflows/pinot_multi_stage_query_engine_compatibility_tests.yml
+++ b/.github/workflows/pinot_multi_stage_query_engine_compatibility_tests.yml
@@ -37,10 +37,10 @@ jobs:
     name: Pinot Multi-Stage Query Engine Compatibility Regression Testing against ${{ github.event.inputs.oldCommit }} and ${{ github.event.inputs.newCommit }} on ${{ matrix.test_suite }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Setup node
diff --git a/.github/workflows/pinot_tests.yml b/.github/workflows/pinot_tests.yml
index ec64fd65915b..fe2758499c8c 100644
--- a/.github/workflows/pinot_tests.yml
+++ b/.github/workflows/pinot_tests.yml
@@ -50,10 +50,10 @@ jobs:
     name: Pinot Linter Test Set
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Install pinot-dependency-verifier into repo
@@ -100,10 +100,12 @@ jobs:
     name: Pinot Binary Compatibility Check
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: |
+            11
+            21
           distribution: 'temurin'
           cache: 'maven'
       # Step that does that actual cache save and restore
@@ -178,7 +180,9 @@ jobs:
       fail-fast: false
       matrix:
         testset: [ 1, 2 ]
-        java: [ 11, 21 ]
+        java: |
+          21
+#          25 # Disable Java 25 tests until we fix the Datasketches compatibility
         distribution: [ "temurin" ]
     name: Pinot Unit Test Set ${{ matrix.testset }} (${{matrix.distribution}}-${{matrix.java}})
     steps:
@@ -186,7 +190,10 @@ jobs:
       - name: Set up JDK ${{ matrix.java }}-${{ matrix.distribution }}
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: |
+            11
+            21
+            25
           distribution: ${{ matrix.distribution }}
           cache: 'maven'
       # Step that does that actual cache save and restore
@@ -323,7 +330,9 @@ jobs:
       - name: Set up JDK ${{ matrix.java }}-${{ matrix.distribution }}
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: |
+            11
+            ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}
           cache: 'maven'
       # Step that does that actual cache save and restore
@@ -489,10 +498,10 @@ jobs:
     name: Pinot Compatibility Regression Testing against ${{ matrix.old_commit }} on ${{ matrix.test_suite }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Setup node
@@ -554,10 +563,10 @@ jobs:
     name: Pinot Multi-Stage Query Engine Compatibility Regression Testing against ${{ matrix.old_commit }} on ${{ matrix.test_suite }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Setup node
@@ -612,7 +621,7 @@ jobs:
       # Changed to false in order to improve coverage using unsafe buffers
       fail-fast: false
       matrix:
-        java: [ 11, 21 ]
+        java: [ 21, 25 ]
         distribution: [ "temurin" ]
     name: Pinot Quickstart on JDK ${{ matrix.java }}-${{ matrix.distribution }}
     steps:
diff --git a/pinot-clients/pinot-java-client/pom.xml b/pinot-clients/pinot-java-client/pom.xml
index af70e7995bc5..ca6519744a24 100644
--- a/pinot-clients/pinot-java-client/pom.xml
+++ b/pinot-clients/pinot-java-client/pom.xml
@@ -32,6 +32,7 @@
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
     <shade.phase.prop>package</shade.phase.prop>
+    <jdk.version>11</jdk.version>
   </properties>
   <build>
     <resources>
diff --git a/pinot-clients/pinot-jdbc-client/pom.xml b/pinot-clients/pinot-jdbc-client/pom.xml
index 66449fbc8122..4c4c56a78f14 100644
--- a/pinot-clients/pinot-jdbc-client/pom.xml
+++ b/pinot-clients/pinot-jdbc-client/pom.xml
@@ -31,6 +31,7 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
+    <jdk.version>11</jdk.version>
   </properties>
   <build>
     <resources>
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index e7dda3066f9c..428673a71e2a 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -32,6 +32,8 @@
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
     <thrift.bin.path>/usr/local/bin/thrift</thrift.bin.path>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>11</jdk.test.version>
   </properties>
 
   <build>
diff --git a/pinot-connectors/pinot-flink-connector/pom.xml b/pinot-connectors/pinot-flink-connector/pom.xml
index a42377029746..3e5923bd3947 100644
--- a/pinot-connectors/pinot-flink-connector/pom.xml
+++ b/pinot-connectors/pinot-flink-connector/pom.xml
@@ -31,6 +31,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>11</jdk.test.version>
   </properties>
 
   <dependencies>
diff --git a/pinot-connectors/pinot-spark-2-connector/pom.xml b/pinot-connectors/pinot-spark-2-connector/pom.xml
index b9638b6c87ee..f9d0aaef8456 100644
--- a/pinot-connectors/pinot-spark-2-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-2-connector/pom.xml
@@ -32,6 +32,8 @@
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
     <shadeBase>org.apache.pinot.\$internal</shadeBase>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>11</jdk.test.version>
   </properties>
 
   <profiles>
diff --git a/pinot-connectors/pinot-spark-3-connector/pom.xml b/pinot-connectors/pinot-spark-3-connector/pom.xml
index b626e6aa48d9..97cbb6b6cae7 100644
--- a/pinot-connectors/pinot-spark-3-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-3-connector/pom.xml
@@ -32,6 +32,8 @@
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
     <shadeBase>org.apache.pinot.\$internal</shadeBase>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>11</jdk.test.version>
   </properties>
 
   <profiles>
diff --git a/pinot-connectors/pinot-spark-common/pom.xml b/pinot-connectors/pinot-spark-common/pom.xml
index 8f9ecba2a59f..883d9277f198 100644
--- a/pinot-connectors/pinot-spark-common/pom.xml
+++ b/pinot-connectors/pinot-spark-common/pom.xml
@@ -31,6 +31,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>11</jdk.test.version>
   </properties>
 
   <profiles>
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java
index 0b2ce9fd3c7b..9ce485adb54c 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/ControllerRequestClient.java
@@ -49,6 +49,8 @@
  *
  * <p>It should be provided with a specified {@link ControllerRequestURLBuilder} for constructing the URL requests
  * as well as a reusable {@link HttpClient} during construction.
+ *
+ * TODO: This should be moved to an external project in order to allow clients to use JDKs older than 21
  */
 public class ControllerRequestClient {
   private final HttpClient _httpClient;
diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
index bf729dd618db..4d08d43bab7c 100644
--- a/pinot-core/pom.xml
+++ b/pinot-core/pom.xml
@@ -31,6 +31,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>21</jdk.test.version>
   </properties>
 
   <dependencies>
diff --git a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml b/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml
index 069a2ffba7d8..0329dc3eb35d 100644
--- a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml
+++ b/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml
@@ -33,6 +33,7 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <shade.phase.prop>package</shade.phase.prop>
+    <jdk.version>11</jdk.version>
   </properties>
 
   <dependencies>
diff --git a/pinot-segment-local/pom.xml b/pinot-segment-local/pom.xml
index ab428b8633a5..cc461e61f35a 100644
--- a/pinot-segment-local/pom.xml
+++ b/pinot-segment-local/pom.xml
@@ -32,6 +32,9 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
+    <jdk.version>11</jdk.version> <!-- Compiles with JDK 11 because it is needed by spark connector -->
+    <!-- Tests with JDK 21 because we include test dependencies that require so (ie pinot-avro) -->
+    <jdk.test.version>21</jdk.test.version>
   </properties>
 
   <dependencies>
diff --git a/pinot-segment-spi/pom.xml b/pinot-segment-spi/pom.xml
index bc7ae661da63..22837ed2d57e 100644
--- a/pinot-segment-spi/pom.xml
+++ b/pinot-segment-spi/pom.xml
@@ -32,6 +32,7 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
+    <jdk.version>11</jdk.version>
   </properties>
 
   <dependencies>
diff --git a/pinot-server/pom.xml b/pinot-server/pom.xml
index 09d2acc0755a..8fe9bceb31fb 100644
--- a/pinot-server/pom.xml
+++ b/pinot-server/pom.xml
@@ -112,6 +112,14 @@
           <repositoryName>lib</repositoryName>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>17</source>
+          <target>17</target>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pinot-spi/pom.xml b/pinot-spi/pom.xml
index 48a85550b08c..b636afb5a439 100644
--- a/pinot-spi/pom.xml
+++ b/pinot-spi/pom.xml
@@ -31,6 +31,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
+    <jdk.version>11</jdk.version>
+    <jdk.test.version>11</jdk.test.version>
   </properties>
 
   <build>
diff --git a/pinot-timeseries/pinot-timeseries-spi/pom.xml b/pinot-timeseries/pinot-timeseries-spi/pom.xml
index e565f4209d73..8b5f14bed335 100644
--- a/pinot-timeseries/pinot-timeseries-spi/pom.xml
+++ b/pinot-timeseries/pinot-timeseries-spi/pom.xml
@@ -33,6 +33,7 @@
 
   <properties>
     <pinot.root>${basedir}/../..</pinot.root>
+    <jdk.version>11</jdk.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 4419e91ed40c..fc878eb6ff10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,22 @@
   <properties>
     <pinot.root>${basedir}</pinot.root>
     <build.profile.id>dev</build.profile.id>
-    <jdk.version>11</jdk.version>
+    <!--
+      By default, the release version is JDK 21.
+      Some projects designed to be used as libraries for external JVMs (like the jdbc driver or the spark connectors)
+      must set their jdk.version to 11 (or whatever they need to support).
+      They also must set jdk.test.version to that same version to be sure test are executed with that version.
+
+      In case these external libraries depend on other internal libraries (ie pinot-common), those libraries need to
+      define jdk.version to the same version as well to avoid compilation issues, but can keep their jdk.test.version
+      to 21 in case they use test dependencies that require so (like pinot-avro).
+
+      This means the internal libraries will be compiled but not verified to be compatible with the lower jdk version.
+      It is the **external library** responsibility to verify that all codepaths of the internal libraries are
+      compatible with the lower jdk version.
+    -->
+    <jdk.version>21</jdk.version>
+    <jdk.test.version>21</jdk.test.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Setting maven.compiler flags to the jdk version. These are used by maven plugins like maven-javadoc-plugin -->
@@ -2297,6 +2312,9 @@
               -Xshare:off
               -XX:+EnableDynamicAgentLoading
             </argLine>
+            <jdkToolchain>
+              <version>${jdk.test.version}</version>
+            </jdkToolchain>
           </configuration>
           <!-- Explicitly select the test provider, instead of relying on the classpath -->
           <dependencies>
@@ -2402,7 +2420,7 @@
             <release>${jdk.version}</release>
             <source>${jdk.version}</source>
             <target>${jdk.version}</target>
-            <fork>true</fork>
+<!--            <fork>true</fork>-->
             <encoding>${project.build.sourceEncoding}</encoding>
             <annotationProcessorPaths>
               <path>
@@ -2426,6 +2444,25 @@
             </annotationProcessorPaths>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-toolchains-plugin</artifactId>
+          <version>1.1</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>toolchain</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <toolchains>
+              <jdk>
+                <version>${jdk.version}</version>
+              </jdk>
+            </toolchains>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>javacc-maven-plugin</artifactId>
@@ -2590,6 +2627,9 @@
           </excludes>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
+          <jdkToolchain>
+            <version>${jdk.test.version}</version>
+          </jdkToolchain>
         </configuration>
         <executions>
           <execution>