diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index cdf2d7c..114ffe0 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -25,4 +25,3 @@ RUN /usr/bin/nextcloud-spreed-signaling-proxy -version
 USER spreedbackend
 
 ENTRYPOINT [ "/entrypoint.sh" ]
-CMD ["/bin/sh", "-c", "/usr/bin/nextcloud-spreed-signaling-proxy -config $CONFIG"]
diff --git a/docker/proxy/entrypoint.sh b/docker/proxy/entrypoint.sh
index 9b255b4..64aae11 100755
--- a/docker/proxy/entrypoint.sh
+++ b/docker/proxy/entrypoint.sh
@@ -22,6 +22,11 @@
 #
 set -e
 
+if [ -n "$1" ]; then
+  # Run custom command.
+  exec "$@"
+fi
+
 if [ -z "$CONFIG" ]; then
   echo "No configuration filename given in CONFIG environment variable"
   exit 1
@@ -107,4 +112,4 @@ if [ ! -f "$CONFIG" ]; then
 fi
 
 echo "Starting signaling proxy with $CONFIG ..."
-exec "$@"
+exec /usr/bin/nextcloud-spreed-signaling-proxy -config "$CONFIG"
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index b338a8d..463633c 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -25,4 +25,3 @@ RUN /usr/bin/nextcloud-spreed-signaling -version
 USER spreedbackend
 
 ENTRYPOINT [ "/entrypoint.sh" ]
-CMD ["/bin/sh", "-c", "/usr/bin/nextcloud-spreed-signaling -config $CONFIG"]
diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index 804d0c3..49939fd 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -22,6 +22,11 @@
 #
 set -e
 
+if [ -n "$1" ]; then
+  # Run custom command.
+  exec "$@"
+fi
+
 if [ -z "$CONFIG" ]; then
   echo "No configuration filename given in CONFIG environment variable"
   exit 1
@@ -261,4 +266,4 @@ if [ ! -f "$CONFIG" ]; then
 fi
 
 echo "Starting signaling server with $CONFIG ..."
-exec "$@"
+exec /usr/bin/nextcloud-spreed-signaling -config "$CONFIG"