diff --git a/rootfs/entrypoint.sh b/rootfs/entrypoint.sh
index 406c7a6..5fc4448 100644
--- a/rootfs/entrypoint.sh
+++ b/rootfs/entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-su-exec fluent "$@"
+exec "$@"
diff --git a/rootfs/fluentd/sbin/boot b/rootfs/fluentd/sbin/boot
index 8307899..ab291cd 100755
--- a/rootfs/fluentd/sbin/boot
+++ b/rootfs/fluentd/sbin/boot
@@ -1,5 +1,5 @@
 #!/bin/bash
-FLUENTD_CONF="/fluentd/etc/fluentd.conf"
+FLUENTD_CONF=${FLUENTD_CONF:-"/fluentd/etc/fluent.conf"}
 INSTALL_BUILD_TOOLS=${INSTALL_BUILD_TOOLS:-"false"}
 BUILD_TOOLS='g++ gcc make ruby-dev'