diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index ea0fbb2565..c26d7af864 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
     steps:
       - name: Checkout twilio-java
         uses: actions/checkout@v3
diff --git a/pom.xml b/pom.xml
index e3c5518c44..634d766a12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,7 @@
     <sonar.projectName>twilio-java</sonar.projectName>
     <sonar.coverage.exclusions>**/test/**/*.*,**/rest/**/*.*</sonar.coverage.exclusions>
     <sonar.cpd.exclusions>**/rest/**/*.*</sonar.cpd.exclusions>
+    <java.version>${java.version}</java.version>
   </properties>
   <dependencies>
     <dependency>
@@ -349,8 +350,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <source>8</source>
-          <target>8</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <showDeprecation>true</showDeprecation>
           <forceJavacCompilerUse>true</forceJavacCompilerUse>
         </configuration>
@@ -494,4 +495,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>