diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0688e2..844467f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,10 @@ version: 2.1
 executors:
   build-executor:
     docker:
-      - image: circleci/openjdk:11.0.7-jdk-buster
+      - image: cimg/openjdk:11.0.7
+  next-build-executor:
+    docker:
+      - image: cimg/openjdk:17.0.11
 
 orbs:
   branch-management: opennms/branch-management@2.3.0
@@ -82,7 +85,7 @@ jobs:
             - project
 
   merge:
-    executor: build-executor
+    executor: next-build-executor
     environment:
       MAVEN_OPTS: -Xmx1024m