diff --git a/.circleci/config.yml b/.circleci/config.yml
index 928fd9bfe4..576f211119 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@
 executors:
   java:
     docker:
-      - image: velo/toolchains-4-ci-builds
+      - image: velo/toolchains-4-ci-builds:with-21
 
 # common commands
 commands:
@@ -86,7 +86,7 @@ jobs:
       - resolve-dependencies
       - save_cache:
           paths:
-            - ~/.m2
+            - ~/.m2/repository
           key: feign-dependencies-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
diff --git a/pom.xml b/pom.xml
index 47d86bead2..01de5b7ed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,8 @@
 
     <!-- default bytecode version for src/main -->
     <main.java.version>1.8</main.java.version>
-    <latest.java.version>17</latest.java.version>
+
+    <latest.java.version>21</latest.java.version>
 
     <!-- default bytecode version for src/test -->
     <maven.compiler.source>${main.java.version}</maven.compiler.source>