diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f4d873f7..5778dddcc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,10 +23,10 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Build with Maven
         run: $MAVEN clean verify
diff --git a/docs/development.md b/docs/development.md
index 16db950b8..0587c1fd7 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -60,7 +60,7 @@ testing
 
 ### Build and run
 
-This project requires Java 17. Note that higher version of Java have not been
+This project requires Java 21. Note that higher version of Java have not been
 verified and may run into unexpected issues.
 
 Run `./mvnw clean install` to build `trino-gateway`. VM options required for
diff --git a/gateway-ha/pom.xml b/gateway-ha/pom.xml
index e1f930471..0c8dec71e 100644
--- a/gateway-ha/pom.xml
+++ b/gateway-ha/pom.xml
@@ -175,6 +175,12 @@
             <version>${dep.jeasy.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.mvel</groupId>
+            <artifactId>mvel2</artifactId>
+            <version>2.5.1.Final</version>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
diff --git a/pom.xml b/pom.xml
index 31ead172b..e2e8de2d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.build.targetJdk>17</project.build.targetJdk>
+        <project.build.targetJdk>21</project.build.targetJdk>
 
-        <air.java.version>17</air.java.version>
+        <air.java.version>21</air.java.version>
         <air.check.skip-enforcer>true</air.check.skip-enforcer>
         <air.check.skip-dependency>true</air.check.skip-dependency>
         <air.check.skip-duplicate-finder>true</air.check.skip-duplicate-finder>