diff --git a/modules/swagger-generator/Dockerfile b/modules/swagger-generator/Dockerfile
index 293d839b145..64b262d43e6 100644
--- a/modules/swagger-generator/Dockerfile
+++ b/modules/swagger-generator/Dockerfile
@@ -1,9 +1,10 @@
-FROM redhat/ubi9-minimal:9.6
-RUN microdnf -y install shadow-utils
-RUN microdnf -y install which
-RUN microdnf -y install glibc-langpack-en
-RUN microdnf -y install tar
-RUN microdnf -y install gzip
+FROM redhat/ubi9-minimal:9.7
+RUN microdnf -y install \
+    glibc-langpack-en \
+    gzip \
+    shadow-utils \
+    tar \
+    which && microdnf clean all
 ENV disableOas31Resolve=False
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
@@ -13,10 +14,10 @@ COPY docker/environment /etc/environment
 WORKDIR /jetty_home
 COPY docker/jetty /jetty_home/
 COPY target/lib/jetty* /jetty_home/lib/
-RUN mkdir /jetty_home/lib/shared
-RUN chgrp -R 0 /jetty_home/lib/shared && \
-    chmod -R g=u /jetty_home/lib/shared
-RUN rm /jetty_home/lib/jetty-runner*
+RUN mkdir /jetty_home/lib/shared && \
+    chgrp -R 0 /jetty_home/lib/shared && \
+    chmod -R g=u /jetty_home/lib/shared && \
+    rm /jetty_home/lib/jetty-runner*
 COPY target/lib/javax.servlet-api* /jetty_home/lib/servlet-api-3.1.jar
 COPY target/lib/start.jar /jetty_home/
 ENV JETTY_HOME /jetty_home
@@ -36,10 +37,10 @@ ENV JAVA_MEM ${JAVA_MEM}
 ENV EXIT_ON_OUTOFMEMORYERROR ""
 WORKDIR $JETTY_BASE
 
-RUN groupadd --gid 2000 codegengroup
-RUN useradd --home "/generator" --gid codegengroup --shell "/bin/bash" --uid "1000" codegenuser
-RUN chown -R codegenuser /generator
-RUN chown -R codegenuser /jetty_home
+RUN groupadd --gid 2000 codegengroup && \
+    useradd --home "/generator" --gid codegengroup --shell "/bin/bash" --uid "1000" codegenuser && \
+    chown -R codegenuser /generator && \
+    chown -R codegenuser /jetty_home
 
 USER codegenuser
 CMD ["./start"]
diff --git a/modules/swagger-generator/Dockerfile_root b/modules/swagger-generator/Dockerfile_root
index c6fcfcb4fe0..0014ddf5082 100644
--- a/modules/swagger-generator/Dockerfile_root
+++ b/modules/swagger-generator/Dockerfile_root
@@ -1,8 +1,10 @@
-FROM redhat/ubi9-minimal:9.6
-RUN microdnf -y install which && \
- microdnf -y install glibc-langpack-en && \
- microdnf -y install tar && \
- microdnf -y install gzip
+FROM redhat/ubi9-minimal:9.7
+RUN microdnf -y install \
+        glibc-langpack-en \
+        gzip \
+        tar \
+        which && \
+    microdnf clean all
 ENV disableOas31Resolve=False
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
@@ -12,10 +14,10 @@ COPY docker/environment /etc/environment
 WORKDIR /jetty_home
 COPY docker/jetty /jetty_home/
 COPY target/lib/jetty* /jetty_home/lib/
-RUN mkdir /jetty_home/lib/shared
-RUN chgrp -R 0 /jetty_home/lib/shared && \
-    chmod -R g=u /jetty_home/lib/shared
-RUN rm /jetty_home/lib/jetty-runner*
+RUN mkdir /jetty_home/lib/shared && \
+    chgrp -R 0 /jetty_home/lib/shared && \
+    chmod -R g=u /jetty_home/lib/shared && \
+    rm /jetty_home/lib/jetty-runner*
 COPY target/lib/javax.servlet-api* /jetty_home/lib/servlet-api-3.1.jar
 COPY target/lib/start.jar /jetty_home/
 ENV JETTY_HOME /jetty_home