diff --git a/.drone/pipelines.yml b/.drone/pipelines.yml
index 5c277a4..3ab232e 100644
--- a/.drone/pipelines.yml
+++ b/.drone/pipelines.yml
@@ -22,7 +22,7 @@ steps :
       - mysql -h db -u svc_testing -psvc_testing -e "CREATE TABLE IF NOT EXISTS svc_testing_db.pipelines (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(50) NOT NULL);"
 
   - name : code-coverage-gate
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     volumes :
       - name : m2cache
@@ -43,7 +43,7 @@ steps :
   - name : static-analysis-gate
     depends_on :
       - code-coverage-gate
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     volumes :
       - name : m2cache
@@ -116,7 +116,7 @@ volumes :
 steps :
 
   - name : publish-snapshot-jar
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     volumes :
       - name : m2cache
         path : /root/.m2
@@ -136,7 +136,7 @@ steps :
           - "*.*.x"
 
   - name : publish-release-jar
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     volumes :
       - name : m2cache
@@ -210,7 +210,7 @@ volumes :
 steps :
 
   - name : package-jar
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     volumes :
       - name : m2cache
@@ -238,7 +238,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_BRANCH:22}-${CI_BUILD_NUMBER}
@@ -261,7 +261,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_BRANCH:22}-${CI_BUILD_NUMBER}
@@ -284,7 +284,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_BRANCH:22}-${CI_BUILD_NUMBER}
@@ -307,7 +307,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_BRANCH:22}-${CI_BUILD_NUMBER}
@@ -330,7 +330,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_TAG}
@@ -353,7 +353,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_TAG}
@@ -376,7 +376,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_TAG}
@@ -399,7 +399,7 @@ steps :
       registry : know-how.download
       force_tag : true
       build_args :
-        - BASE_IMAGE=know-how.download/jre:ibm-semeru-runtimes-open-17-jre-focal
+        - BASE_IMAGE=know-how.download/jre:openjdk-21-slim-bookworm
         - BUILD_VERSION=${DRONE_COMMIT}
       tags :
         - ${DRONE_TAG}
@@ -424,7 +424,7 @@ trigger :
 
 steps :
   - name : deploy
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     environment :
       HELM_CHARTS_REPOSITORY :
@@ -469,7 +469,7 @@ trigger :
 
 steps :
   - name : rollback
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     environment :
       HELM_CHARTS_REPOSITORY :
@@ -494,7 +494,7 @@ trigger :
 
 steps :
   - name : deploy
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     environment :
       HELM_CHARTS_REPOSITORY :
@@ -540,7 +540,7 @@ trigger :
 
 steps :
   - name : rollback
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     environment :
       HELM_CHARTS_REPOSITORY :
@@ -570,7 +570,7 @@ steps :
 
   - name : create-release-tag
     failure : ignore
-    image : know-how.download/svc-builder:ibm-semeru-runtimes-open-17-jdk-focal
+    image : know-how.download/svc-builder:openjdk-21-slim-bookworm
     pull : if-not-exists
     volumes :
       - name : m2cache