diff --git a/Dockerfile b/Dockerfile
index 9e6f9e6..7b0a3c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,4 +23,4 @@ RUN chmod 755 /sbin/entrypoint.sh
 
 EXPOSE 53/udp 10000/tcp
 VOLUME ["${DATA_DIR}"]
-CMD ["/sbin/entrypoint.sh"]
+ENTRYPOINT ["/sbin/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 9f93894..892a5f7 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -48,4 +48,9 @@ fi
 echo "Starting named..."
 mkdir -m 0775 -p /var/run/named
 chown root:${BIND_USER} /var/run/named
-exec /usr/sbin/named -u ${BIND_USER} -g
+
+if [ -z "$@" ]; then
+  exec /usr/sbin/named -u ${BIND_USER} -g
+else
+  exec "$@"
+fi