diff --git a/docker/docker_official_images/3.7.0/jvm/Dockerfile b/docker/docker_official_images/3.8.0/jvm/Dockerfile
similarity index 66%
rename from docker/docker_official_images/3.7.0/jvm/Dockerfile
rename to docker/docker_official_images/3.8.0/jvm/Dockerfile
index 905e2f2149bba..6f590ad2826f1 100755
--- a/docker/docker_official_images/3.7.0/jvm/Dockerfile
+++ b/docker/docker_official_images/3.8.0/jvm/Dockerfile
@@ -18,27 +18,25 @@
 
 FROM eclipse-temurin:21-jre-alpine AS build-jsa
 
-USER root
-
-# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version 3.7.0
-ENV kafka_url https://archive.apache.org/dist/kafka/3.7.0/kafka_2.13-3.7.0.tgz
+# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version 3.8.0
+ENV kafka_url https://archive.apache.org/dist/kafka/3.8.0/kafka_2.13-3.8.0.tgz
 
 COPY jsa_launch /etc/kafka/docker/jsa_launch
 
 RUN set -eux ; \
-    apk update ; \
-    apk upgrade ; \
     apk add --no-cache wget gcompat gpg gpg-agent procps bash; \
-    mkdir opt/kafka; \
     wget -nv -O kafka.tgz "$kafka_url"; \
     wget -nv -O kafka.tgz.asc "$kafka_url.asc"; \
+    export GNUPGHOME="$(mktemp -d)"; \
+    gpg --batch --keyserver hkp://keys.openpgp.org --recv-keys CF9500821E9557AEB04E026C05EEA67F87749E61 || \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys CF9500821E9557AEB04E026C05EEA67F87749E61 ; \
+    gpg --batch --verify kafka.tgz.asc kafka.tgz; \
+    gpgconf --kill all; \
+    rm -rf "$GNUPGHOME" kafka.tgz.asc; \
+    mkdir opt/kafka; \
     tar xfz kafka.tgz -C /opt/kafka --strip-components 1; \
-    wget -nv -O KEYS https://downloads.apache.org/kafka/KEYS; \
-    gpg --import KEYS; \
-    gpg --batch --verify kafka.tgz.asc kafka.tgz
-
-# Generate jsa files using dynamic CDS for kafka server start command and kafka storage format command
-RUN /etc/kafka/docker/jsa_launch
+    # Generate jsa files using dynamic CDS for kafka server start command and kafka storage format command
+    /etc/kafka/docker/jsa_launch
 
 
 FROM eclipse-temurin:21-jre-alpine
@@ -46,30 +44,28 @@ FROM eclipse-temurin:21-jre-alpine
 # exposed ports
 EXPOSE 9092
 
-USER root
-
-# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version 3.7.0
-ENV kafka_url https://archive.apache.org/dist/kafka/3.7.0/kafka_2.13-3.7.0.tgz
-ENV build_date 2024-06-11
+# Get Kafka from https://archive.apache.org/dist/kafka, url passed as env var, for version 3.8.0
+ENV kafka_url https://archive.apache.org/dist/kafka/3.8.0/kafka_2.13-3.8.0.tgz
+ENV build_date 2024-08-13
 
-
-LABEL org.label-schema.name="kafka" \
-      org.label-schema.description="Apache Kafka" \
-      org.label-schema.build-date="${build_date}" \
-      org.label-schema.vcs-url="https://github.com/apache/kafka" \
+LABEL org.opencontainers.image.title="kafka" \
+      org.opencontainers.image.description="Apache Kafka" \
+      org.opencontainers.image.created="${build_date}" \
+      org.opencontainers.image.source="https://github.com/apache/kafka" \
       maintainer="Apache Kafka"
 
 RUN set -eux ; \
-    apk update ; \
-    apk upgrade ; \
     apk add --no-cache wget gcompat gpg gpg-agent procps bash; \
-    mkdir opt/kafka; \
     wget -nv -O kafka.tgz "$kafka_url"; \
     wget -nv -O kafka.tgz.asc "$kafka_url.asc"; \
-    tar xfz kafka.tgz -C /opt/kafka --strip-components 1; \
-    wget -nv -O KEYS https://downloads.apache.org/kafka/KEYS; \
-    gpg --import KEYS; \
+    export GNUPGHOME="$(mktemp -d)"; \
+    gpg --batch --keyserver hkp://keys.openpgp.org --recv-keys CF9500821E9557AEB04E026C05EEA67F87749E61 || \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys CF9500821E9557AEB04E026C05EEA67F87749E61 ; \
     gpg --batch --verify kafka.tgz.asc kafka.tgz; \
+    gpgconf --kill all; \
+    rm -rf "$GNUPGHOME" kafka.tgz.asc; \
+    mkdir opt/kafka; \
+    tar xfz kafka.tgz -C /opt/kafka --strip-components 1; \
     mkdir -p /var/lib/kafka/data /etc/kafka/secrets; \
     mkdir -p /etc/kafka/docker /usr/logs /mnt/shared/config; \
     adduser -h /home/appuser -D --shell /bin/bash appuser; \
@@ -79,9 +75,8 @@ RUN set -eux ; \
     cp /opt/kafka/config/log4j.properties /etc/kafka/docker/log4j.properties; \
     cp /opt/kafka/config/tools-log4j.properties /etc/kafka/docker/tools-log4j.properties; \
     cp /opt/kafka/config/kraft/server.properties /etc/kafka/docker/server.properties; \
-    rm kafka.tgz kafka.tgz.asc KEYS; \
-    apk del wget gpg gpg-agent; \
-    apk cache clean;
+    rm kafka.tgz; \
+    apk del wget gpg gpg-agent; 
 
 COPY --from=build-jsa kafka.jsa /opt/kafka/kafka.jsa
 COPY --from=build-jsa storage.jsa /opt/kafka/storage.jsa
@@ -92,4 +87,4 @@ USER appuser
 
 VOLUME ["/etc/kafka/secrets", "/var/lib/kafka/data", "/mnt/shared/config"]
 
-CMD ["/etc/kafka/docker/run"]
+CMD ["/etc/kafka/docker/run"]
\ No newline at end of file
diff --git a/docker/docker_official_images/3.7.0/jvm/jsa_launch b/docker/docker_official_images/3.8.0/jvm/jsa_launch
similarity index 100%
rename from docker/docker_official_images/3.7.0/jvm/jsa_launch
rename to docker/docker_official_images/3.8.0/jvm/jsa_launch
diff --git a/docker/docker_official_images/3.7.0/jvm/launch b/docker/docker_official_images/3.8.0/jvm/launch
similarity index 100%
rename from docker/docker_official_images/3.7.0/jvm/launch
rename to docker/docker_official_images/3.8.0/jvm/launch
diff --git a/docker/docker_official_images/3.7.0/jvm/resources/common-scripts/bash-config b/docker/docker_official_images/3.8.0/jvm/resources/common-scripts/bash-config
similarity index 100%
rename from docker/docker_official_images/3.7.0/jvm/resources/common-scripts/bash-config
rename to docker/docker_official_images/3.8.0/jvm/resources/common-scripts/bash-config
diff --git a/docker/docker_official_images/3.7.0/jvm/resources/common-scripts/configure b/docker/docker_official_images/3.8.0/jvm/resources/common-scripts/configure
similarity index 100%
rename from docker/docker_official_images/3.7.0/jvm/resources/common-scripts/configure
rename to docker/docker_official_images/3.8.0/jvm/resources/common-scripts/configure
diff --git a/docker/docker_official_images/3.7.0/jvm/resources/common-scripts/configureDefaults b/docker/docker_official_images/3.8.0/jvm/resources/common-scripts/configureDefaults
similarity index 100%
rename from docker/docker_official_images/3.7.0/jvm/resources/common-scripts/configureDefaults
rename to docker/docker_official_images/3.8.0/jvm/resources/common-scripts/configureDefaults
diff --git a/docker/docker_official_images/3.7.0/jvm/resources/common-scripts/run b/docker/docker_official_images/3.8.0/jvm/resources/common-scripts/run
similarity index 100%
rename from docker/docker_official_images/3.7.0/jvm/resources/common-scripts/run
rename to docker/docker_official_images/3.8.0/jvm/resources/common-scripts/run