diff --git a/14/Dockerfile b/14/Dockerfile
index 82d3fe0..a1b31af 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:14
-MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
+LABEL org.opencontainers.image.authors="containers@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=node.local
@@ -22,4 +22,4 @@ COPY config/supervisor/* /etc/supervisor/conf.d/
 RUN mkdir -p /var/log/supervisor
 
 # Define the command to run per default
-CMD /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
+CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisor/supervisord.conf"]
diff --git a/16/Dockerfile b/16/Dockerfile
index 0c039ac..5ece5f1 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:16
-MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
+LABEL org.opencontainers.image.authors="containers@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=node.local
@@ -22,4 +22,4 @@ COPY config/supervisor/* /etc/supervisor/conf.d/
 RUN mkdir -p /var/log/supervisor
 
 # Define the command to run per default
-CMD /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
+CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisor/supervisord.conf"]
diff --git a/18/Dockerfile b/18/Dockerfile
index 16ab3c6..c5fa8f2 100644
--- a/18/Dockerfile
+++ b/18/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:18
-MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
+LABEL org.opencontainers.image.authors="containers@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=node.local
@@ -22,4 +22,4 @@ COPY config/supervisor/* /etc/supervisor/conf.d/
 RUN mkdir -p /var/log/supervisor
 
 # Define the command to run per default
-CMD /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
+CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisor/supervisord.conf"]
diff --git a/19/Dockerfile b/19/Dockerfile
index d60d027..cb4231d 100644
--- a/19/Dockerfile
+++ b/19/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:19
-MAINTAINER Hermann Mayer "hermann.mayer@hausgold.de"
+LABEL org.opencontainers.image.authors="containers@hausgold.de"
 
 # You can change this environment variable on run's with -e
 ENV MDNS_HOSTNAME=node.local
@@ -22,4 +22,4 @@ COPY config/supervisor/* /etc/supervisor/conf.d/
 RUN mkdir -p /var/log/supervisor
 
 # Define the command to run per default
-CMD /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
+CMD ["/usr/bin/supervisord", "-nc", "/etc/supervisor/supervisord.conf"]