diff --git a/manifests/init.pp b/manifests/init.pp
index ad9ef8e..8cc04bd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,7 @@
 class fluentd (
   Optional[String] $aws_key_id = $::fluentd::params::aws_key_id,
   Optional[String] $aws_sec_key = $::fluentd::params::aws_sec_key,
-  Boolean $init_manage = $::fluentd::params::init_manage,
+  Boolean $systemd_manage = $::fluentd::params::init_manage,
   Boolean $repo_install = $::fluentd::params::repo_install,
   String $repo_name = $::fluentd::params::repo_name,
   String $repo_desc = $::fluentd::params::repo_desc,
diff --git a/manifests/install.pp b/manifests/install.pp
index fe7a57c..95acb16 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -7,10 +7,10 @@
     ensure => $fluentd::package_ensure,
   }
 
-  -> if $fluentd::init_manage {
-    file { '/etc/init.d/td-agent':
+  -> if $fluentd::systemd_manage {
+    file { '/usr/lib/systemd/system/td-agent.service':
       ensure  => file,
-      content => template('fluentd/td-agent.erb'),
+      content => template('fluentd/td-agent.service.erb'),
     }
       ~> exec { '/usr/bin/systemctl daemon-reload':
       refreshonly => true,
diff --git a/manifests/params.pp b/manifests/params.pp
index 219bda5..a71414b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -46,7 +46,7 @@
   $config_group = 'td-agent'
   $aws_key_id = undef
   $aws_sec_key = undef
-  $init_manage = false
+  $systemd_manage = false
   $configs = {}
 
   $plugins = {}
diff --git a/templates/td-agent.erb b/templates/td-agent.erb
deleted file mode 100644
index 58248e3..0000000
--- a/templates/td-agent.erb
+++ /dev/null
@@ -1,351 +0,0 @@
-#!/bin/sh
-#This file is managed by Puppet. Do not modify!
-### BEGIN INIT INFO
-# Provides:          td-agent
-# Required-Start:    $network $local_fs
-# Required-Stop:     $network $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: data collector for Treasure Data
-# Description:       td-agent is a data collector
-### END INIT INFO
-
-# pidfile:           /var/run/td-agent/td-agent.pid
-
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
-export AWS_SECRET_ACCESS_KEY=<%= @aws_sec_key %>
-export AWS_ACCESS_KEY_ID=<%= @aws_key_id %>
-
-TD_AGENT_NAME=td-agent
-TD_AGENT_HOME=/opt/td-agent
-TD_AGENT_DEFAULT=/etc/sysconfig/td-agent
-TD_AGENT_USER=td-agent
-TD_AGENT_GROUP=td-agent
-TD_AGENT_RUBY=/opt/td-agent/embedded/bin/ruby
-TD_AGENT_BIN_FILE=/usr/sbin/td-agent
-TD_AGENT_LOG_FILE=/var/log/td-agent/td-agent.log
-TD_AGENT_PID_FILE=/var/run/td-agent/td-agent.pid
-TD_AGENT_LOCK_FILE=/var/lock/subsys/td-agent
-TD_AGENT_OPTIONS="--use-v1-config"
-
-# timeout can be overridden from /etc/sysconfig/td-agent
-STOPTIMEOUT=120
-
-# Read configuration variable file if it is present
-if [ -f "${TD_AGENT_DEFAULT}" ]; then
-  . "${TD_AGENT_DEFAULT}"
-fi
-
-if [ -n "${name}" ]; then
-  # backward compatibility with omnibus-td-agent <= 2.2.0. will be deleted from future release.
-  echo "Warning: Declaring \$name in ${TD_AGENT_DEFAULT} has been deprecated. Use \$TD_AGENT_NAME instead." 1>&2
-  TD_AGENT_NAME="${name}"
-fi
-
-if [ -n "${prog}" ]; then
-  # backward compatibility with omnibus-td-agent <= 2.2.0. will be deleted from future release.
-  echo "Warning: Declaring \$prog in ${TD_AGENT_DEFAULT} for customizing \$PIDFILE has been deprecated. Use \$TD_AGENT_PID_FILE instead." 1>&2
-  if [ -z "${PIDFILE}" ]; then
-    TD_AGENT_PID_FILE="//var/run/td-agent/${prog}.pid"
-  fi
-  TD_AGENT_LOCK_FILE="//var/lock/subsys/${prog}"
-  TD_AGENT_PROG_NAME="${prog}"
-else
-  unset TD_AGENT_PROG_NAME
-fi
-
-if [ -n "${process_bin}" ]; then
-  # backward compatibility with omnibus-td-agent <= 2.2.0. will be deleted from future release.
-  echo "Warning: Declaring \$process_bin in ${TD_AGENT_DEFAULT} has been deprecated. Use \$TD_AGENT_RUBY instead." 1>&2
-  TD_AGENT_RUBY="${process_bin}"
-fi
-
-if [ -n "${PIDFILE}" ]; then
-  echo "Warning: Declaring \$PIDFILE in ${TD_AGENT_DEFAULT} has been deprecated. Use \$TD_AGENT_PIDFILE instead." 1>&2
-  TD_AGENT_PID_FILE="${PIDFILE}"
-fi
-
-if [ -n "${DAEMON_ARGS}" ]; then
-# TODO: Show warning on use of `DAEMON_ARGS`
-# echo "Warning: Declaring \$DAEMON_ARGS in ${TD_AGENT_DEFAULT} has been deprecated. Use \$TD_AGENT_OPTIONS instead." 1>&2
-  START_STOP_DAEMON_ARGS=""
-  parse_daemon_args() {
-    while [ -n "$1" ]; do
-      case "$1" in
-      "--user="?* )
-        echo "Warning: Declaring --user in \$DAEMON_ARGS has been deprecated. Use \$TD_AGENT_USER instead." 1>&2
-        TD_AGENT_USER="${1#*=}"
-        ;;
-      "--user" )
-        echo "Warning: Declaring --user in \$DAEMON_ARGS has been deprecated. Use \$TD_AGENT_USER instead." 1>&2
-        shift 1
-        TD_AGENT_USER="$1"
-        ;;
-      * )
-        START_STOP_DAEMON_ARGS="${START_STOP_DAEMON_ARGS} $1"
-        ;;
-      esac
-      shift 1
-    done
-  }
-  parse_daemon_args ${DAEMON_ARGS}
-fi
-
-if [ -n "${TD_AGENT_ARGS}" ]; then
-  ORIG_TD_AGENT_ARGS="${TD_AGENT_ARGS}"
-  TD_AGENT_ARGS=""
-  parse_td_agent_args() {
-    while [ -n "$1" ]; do
-      case "$1" in
-      "--group="?* )
-        echo "Warning: Declaring --group in \$TD_AGENT_ARGS has been deprecated. Use \$TD_AGENT_GROUP instead." 1>&2
-        TD_AGENT_GROUP="${1#*=}"
-        ;;
-      "--group" )
-        echo "Warning: Declaring --group in \$TD_AGENT_ARGS has been deprecated. Use \$TD_AGENT_GROUP instead." 1>&2
-        shift 1
-        TD_AGENT_GROUP="$1"
-        ;;
-      "--user="?* )
-        echo "Warning: Declaring --user in \$TD_AGENT_ARGS has been deprecated. Use \$TD_AGENT_USER instead." 1>&2
-        TD_AGENT_USER="${1#*=}"
-        ;;
-      "--user" )
-        echo "Warning: Declaring --user in \$TD_AGENT_ARGS has been deprecated. Use \$TD_AGENT_USER instead." 1>&2
-        shift 1
-        TD_AGENT_USER="$1"
-        ;;
-      * )
-        TD_AGENT_ARGS="${TD_AGENT_ARGS} $1"
-        ;;
-      esac
-      shift 1
-    done
-  }
-  parse_td_agent_args ${ORIG_TD_AGENT_ARGS}
-fi
-
-# Arguments to run the daemon with
-TD_AGENT_ARGS="${TD_AGENT_ARGS:-${TD_AGENT_BIN_FILE} --log ${TD_AGENT_LOG_FILE} ${TD_AGENT_OPTIONS}}"
-START_STOP_DAEMON_ARGS="${START_STOP_DAEMON_ARGS}"
-
-# Exit if the package is not installed
-[ -x "${TD_AGENT_RUBY}" ] || exit 0
-
-# Source function library.
-. /etc/init.d/functions
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-# Check the user
-if [ -n "${TD_AGENT_USER}" ]; then
-  if ! getent passwd | grep -q "^${TD_AGENT_USER}:"; then
-    echo "$0: user for running ${TD_AGENT_NAME} doesn't exist: ${TD_AGENT_USER}" >&2
-    exit 1
-  fi
-  mkdir -p "$(dirname "${TD_AGENT_PID_FILE}")"
-  chown -R "${TD_AGENT_USER}" "$(dirname "${TD_AGENT_PID_FILE}")"
-  START_STOP_DAEMON_ARGS="${START_STOP_DAEMON_ARGS} --user ${TD_AGENT_USER}"
-fi
-
-if [ -n "${TD_AGENT_GROUP}" ]; then
-  if ! getent group | grep -q "^${TD_AGENT_GROUP}:"; then
-    echo "$0: group for running ${TD_AGENT_NAME} doesn't exist: ${TD_AGENT_GROUP}" >&2
-    exit 1
-  fi
-  TD_AGENT_ARGS="${TD_AGENT_ARGS} --group ${TD_AGENT_GROUP}"
-fi
-
-if [ -n "${TD_AGENT_PID_FILE}" ]; then
-  mkdir -p "$(dirname "${TD_AGENT_PID_FILE}")"
-  chown -R "${TD_AGENT_USER}" "$(dirname "${TD_AGENT_PID_FILE}")"
-  TD_AGENT_ARGS="${TD_AGENT_ARGS} --daemon ${TD_AGENT_PID_FILE}"
-fi
-
-# 2012/04/17 Kazuki Ohta <k@treasure-data.com>
-# Use jemalloc to avoid memory fragmentation
-if [ -f "${TD_AGENT_HOME}/embedded/lib/libjemalloc.so" ]; then
-  export LD_PRELOAD="${TD_AGENT_HOME}/embedded/lib/libjemalloc.so"
-fi
-
-kill_by_file() {
-  local sig="$1"
-  shift 1
-  local pid="$(cat "$@" 2>/dev/null || true)"
-  if [ -n "${pid}" ]; then
-    if /bin/kill "${sig}" "${pid}" 1>/dev/null 2>&1; then
-      return 0
-    else
-      return 2
-    fi
-  else
-    return 1
-  fi
-}
-
-#
-# Function that starts the daemon/service
-#
-do_start() {
-  # Set Max number of file descriptors for the safety sake
-  # see http://docs.fluentd.org/en/articles/before-install
-  ulimit -n 65536 1>/dev/null 2>&1 || true
-  local RETVAL=0
-  daemon --pidfile="${TD_AGENT_PID_FILE}" ${START_STOP_DAEMON_ARGS} "${TD_AGENT_RUBY}" ${TD_AGENT_ARGS} || RETVAL="$?"
-  [ $RETVAL -eq 0 ] && touch "${TD_AGENT_LOCK_FILE}"
-  return $RETVAL
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop() {
-  # Return
-  #   0 if daemon has been stopped
-  #   1 if daemon was already stopped
-  #   2 if daemon could not be stopped
-  #   other if a failure occurred
-  if [ -e "${TD_AGENT_PID_FILE}" ]; then
-    # Use own process termination instead of killproc because killproc can't wait SIGTERM
-    if kill_by_file -TERM "${TD_AGENT_PID_FILE}"; then
-      local i
-      for i in $(seq "${STOPTIMEOUT}"); do
-        if kill_by_file -0 "${TD_AGENT_PID_FILE}"; then
-          sleep 1
-        else
-          break
-        fi
-      done
-      if kill_by_file -0 "${TD_AGENT_PID_FILE}"; then
-        echo -n "Timeout error occurred trying to stop ${TD_AGENT_NAME}..."
-        return 2
-      else
-        rm -f "${TD_AGENT_PID_FILE}"
-        rm -f "${TD_AGENT_LOCK_FILE}"
-      fi
-    else
-      return 1
-    fi
-  else
-    if killproc "${TD_AGENT_PROG_NAME:-${TD_AGENT_NAME}}"; then
-      rm -f "${TD_AGENT_PID_FILE}"
-      rm -f "${TD_AGENT_LOCK_FILE}"
-    else
-      return 2
-    fi
-  fi
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-  kill_by_file -HUP "${TD_AGENT_PID_FILE}"
-}
-
-do_restart() {
-  if ! do_configtest; then
-    return 1
-  fi
-  local val=0
-  do_stop || val="$?"
-  case "${val}" in
-  0 | 1 )
-    if ! do_start; then
-      return 1
-    fi
-    ;;
-  * ) # Failed to stop
-    return 1
-    ;;
-  esac
-}
-
-do_configtest() {
-  eval "${TD_AGENT_ARGS} ${START_STOP_DAEMON_ARGS} --dry-run -q"
-}
-
-RETVAL=0
-case "$1" in
-"start" )
-  echo -n "Starting ${TD_AGENT_NAME}: "
-  do_start || RETVAL="$?"
-  case "$RETVAL" in
-  0 )
-    log_success_msg "${TD_AGENT_NAME}"
-    ;;
-  * )
-    log_failure_msg "${TD_AGENT_NAME}"
-    exit 1
-    ;;
-  esac
-  ;;
-"stop" )
-  echo -n "Stopping ${TD_AGENT_NAME}: "
-  do_stop || RETVAL="$?"
-  case "$RETVAL" in
-  0 )
-    log_success_msg "${TD_AGENT_NAME}"
-    ;;
-  * )
-    log_failure_msg "${TD_AGENT_NAME}"
-    exit 1
-    ;;
-  esac
-  ;;
-"reload" )
-  echo -n "Reloading ${TD_AGENT_NAME}: "
-  if ! do_configtest; then
-    log_failure_msg "${TD_AGENT_NAME}"
-    exit 1
-  fi
-  if do_reload; then
-    log_success_msg "${TD_AGENT_NAME}"
-  else
-    log_failure_msg "${TD_AGENT_NAME}"
-    exit 1
-  fi
-  ;;
-"restart" )
-  echo -n "Restarting ${TD_AGENT_NAME}: "
-  if do_restart; then
-    log_success_msg "${TD_AGENT_NAME}"
-  else
-    log_failure_msg "${TD_AGENT_NAME}"
-    exit 1
-  fi
-  ;;
-"status" )
-  if kill_by_file -0 "${TD_AGENT_PID_FILE}"; then
-    log_success_msg "${TD_AGENT_NAME} is running"
-  else
-    log_failure_msg "${TD_AGENT_NAME} is not running"
-    exit 1
-  fi
-  ;;
-"condrestart" )
-  if [ -f "${TD_AGENT_LOCK_FILE}" ]; then
-    echo -n "Restarting ${TD_AGENT_NAME}: "
-    if do_restart; then
-      log_success_msg "${TD_AGENT_NAME}"
-    else
-      log_failure_msg "${TD_AGENT_NAME}"
-      exit 1
-    fi
-  fi
-  ;;
-"configtest" )
-  if do_configtest; then
-    log_success_msg "${TD_AGENT_NAME}"
-  else
-    log_failure_msg "${TD_AGENT_NAME}"
-    exit 1
-  fi
-  ;;
-* )
-  echo "Usage: $0 {start|stop|reload|restart|condrestart|status|configtest}" >&2
-  exit 1
-  ;;
-esac
diff --git a/templates/td-agent.service.erb b/templates/td-agent.service.erb
new file mode 100644
index 0000000..87484aa
--- /dev/null
+++ b/templates/td-agent.service.erb
@@ -0,0 +1,31 @@
+#This file is managed by Puppet. Do not modify!
+[Unit]
+Description=td-agent: Fluentd based data collector for Treasure Data
+Documentation=https://docs.treasuredata.com/articles/td-agent
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+User=td-agent
+Group=td-agent
+LimitNOFILE=65536
+Environment=AWS_SECRET_ACCESS_KEY=<%= @aws_sec_key %>
+Environment=AWS_ACCESS_KEY_ID=<%= @aws_key_id %>
+Environment=LD_PRELOAD=/opt/td-agent/embedded/lib/libjemalloc.so
+Environment=GEM_HOME=/opt/td-agent/embedded/lib/ruby/gems/2.4.0/
+Environment=GEM_PATH=/opt/td-agent/embedded/lib/ruby/gems/2.4.0/
+Environment=FLUENT_CONF=/etc/td-agent/td-agent.conf
+Environment=FLUENT_PLUGIN=/etc/td-agent/plugin
+Environment=FLUENT_SOCKET=/var/run/td-agent/td-agent.sock
+Environment=TD_AGENT_OPTIONS=
+PIDFile=/var/run/td-agent/td-agent.pid
+RuntimeDirectory=td-agent
+Type=forking
+ExecStart=/opt/td-agent/embedded/bin/fluentd --log /var/log/td-agent/td-agent.log --daemon /var/run/td-agent/td-agent.pid $TD_AGENT_OPTIONS
+ExecStop=/bin/kill -TERM ${MAINPID}
+ExecReload=/bin/kill -HUP ${MAINPID}
+Restart=always
+TimeoutStopSec=120
+
+[Install]
+WantedBy=multi-user.target