diff --git a/docker/jvm/Dockerfile b/docker/jvm/Dockerfile
index 3d2f06820d4..1c7c95d4869 100644
--- a/docker/jvm/Dockerfile
+++ b/docker/jvm/Dockerfile
@@ -68,7 +68,7 @@ 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" \
-      maintainer="Apache Kafka"
+      org.opencontainers.image.authors="Apache Kafka"
 
 RUN mkdir opt/kafka; \
     set -eux ; \
diff --git a/docker/native/Dockerfile b/docker/native/Dockerfile
index 010edbcd51c..d458dab72ce 100644
--- a/docker/native/Dockerfile
+++ b/docker/native/Dockerfile
@@ -55,7 +55,7 @@ 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" \
-      maintainer="Apache Kafka"
+      org.opencontainers.image.authors="Apache Kafka"
 
 RUN apk update ; \
     apk add --no-cache gcompat ; \
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index bf69bc0e371..f1cbd987352 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -44,14 +44,14 @@ RUN if [ "$KAFKA_MODE" = "native" ]; then \
 
 FROM $jdk_version
 
-MAINTAINER Apache Kafka dev@kafka.apache.org
+LABEL org.opencontainers.image.authors="Apache Kafka dev@kafka.apache.org"
 VOLUME ["/opt/kafka-dev"]
 
 # Set the timezone.
 ENV TZ="/usr/share/zoneinfo/America/Los_Angeles"
 
 # Do not ask for confirmations when running apt-get, etc.
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Set the ducker.creator label so that we know that this is a ducker image.  This will make it
 # visible to 'ducker purge'.  The ducker.creator label also lets us know what UNIX user built this
@@ -155,4 +155,4 @@ RUN useradd -u $UID -ms /bin/bash ducker \
 
 USER ducker
 
-CMD sudo service ssh start && tail -f /dev/null
+CMD ["sudo", "service", "ssh", "start", "-D"]