diff --git a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.jlink.mustache b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.jlink.mustache
index dac98bcd4e2..7abaa1bc3f0 100644
--- a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.jlink.mustache
+++ b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.jlink.mustache
@@ -1,6 +1,16 @@
 
 # 1st stage, build the app
-FROM maven:3.8.4-openjdk-17-slim as build
+FROM container-registry.oracle.com/java/jdk-no-fee-term:17 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
 
 WORKDIR /helidon
 
@@ -19,7 +29,7 @@ RUN echo "done!"
 
 # 2nd stage, build the final image with the JRI built in the 1st stage
 
-FROM debian:stretch-slim
+FROM container-registry.oracle.com/os/oraclelinux:9-slim
 WORKDIR /helidon
 COPY --from=build /helidon/target/{{artifactId}}-jri ./
 ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
diff --git a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.mustache b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.mustache
index b576203be88..283644c819e 100644
--- a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.mustache
+++ b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.mustache
@@ -1,6 +1,16 @@
 
 # 1st stage, build the app
-FROM maven:3.8.4-openjdk-17-slim as build
+FROM container-registry.oracle.com/java/jdk-no-fee-term:17 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
 
 WORKDIR /helidon
 
@@ -22,7 +32,7 @@ RUN mvn package -DskipTests
 RUN echo "done!"
 
 # 2nd stage, build the runtime image
-FROM openjdk:17-jdk-slim
+FROM container-registry.oracle.com/java/jdk-no-fee-term:17
 WORKDIR /helidon
 
 # Copy the binary built in the 1st stage
diff --git a/lra/coordinator/server/Dockerfile b/lra/coordinator/server/Dockerfile
index a496cd4a6c2..b1be36dc99c 100644
--- a/lra/coordinator/server/Dockerfile
+++ b/lra/coordinator/server/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM container-registry.oracle.com/java/openjdk:17 as build
+FROM container-registry.oracle.com/java/jdk-no-fee-term:17 as build
 
 WORKDIR /usr/share
 
@@ -41,7 +41,7 @@ RUN wget -q -O helidon_repo.zip https://github.com/${HELIDON_REPOSITORY}/archive
 RUN mvn install -pl :helidon-lra-coordinator-server -am -DskipTests && \
     echo "Helidon LRA Coordinator build successfully finished"
 
-FROM container-registry.oracle.com/java/openjdk:17
+FROM container-registry.oracle.com/java/jdk-no-fee-term:17
 WORKDIR /helidon
 
 COPY --from=build /helidon/lra/coordinator/server/target/helidon-lra-coordinator-server.jar ./