diff --git a/files/nodepool-deleter.init b/files/nodepool-deleter.init
new file mode 100755
index 0000000..86cb50c
--- /dev/null
+++ b/files/nodepool-deleter.init
@@ -0,0 +1,162 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          nodepool-deleter
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Nodepool Deleter
+# Description:       Trunk gating system
+### END INIT INFO
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="Nodepool Deleter"
+NAME=nodepool-deleter
+DAEMON=/usr/local/bin/nodepoold
+PIDFILE=/var/run/$NAME/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=nodepool
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+
+        mkdir -p /var/run/$NAME
+	chown $USER /var/run/$NAME
+	ulimit -n 8192
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# 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
+	start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	rm -f /var/run/$NAME/*
+	return "$RETVAL"
+}
+
+#
+# Function that stops the daemon/service
+#
+do_graceful_stop()
+{
+	PID=`cat $PIDFILE`
+	kill -INT $PID
+	# Old nodepoold used USR1
+	# New nodepoold ignores it while INT is being handled
+	kill -USR1 $PID
+
+	# wait until really stopped
+	if [ -n "${PID:-}" ]; then
+		i=0
+		while kill -0 "${PID:-}" 2> /dev/null;  do
+			if [ $i -eq '0' ]; then
+				echo -n " ... waiting "
+			else
+				echo -n "."
+			fi
+			i=$(($i+1))
+			sleep 1
+		done
+	fi
+
+	rm -f /var/run/$NAME/*
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	log_daemon_msg "Reloading $DESC" "$NAME"
+	do_reload
+	log_end_msg $?
+	;;
+  restart)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_graceful_stop
+	do_start
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
diff --git a/files/nodepool-launcher.init b/files/nodepool-launcher.init
new file mode 100755
index 0000000..cd3acaa
--- /dev/null
+++ b/files/nodepool-launcher.init
@@ -0,0 +1,162 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          nodepool-launcher
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Nodepool Launcher
+# Description:       Trunk gating system
+### END INIT INFO
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="Nodepool Launcher"
+NAME=nodepool-launcher
+DAEMON=/usr/local/bin/nodepoold
+PIDFILE=/var/run/$NAME/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=nodepool
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+
+        mkdir -p /var/run/$NAME
+	chown $USER /var/run/$NAME
+	ulimit -n 8192
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# 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
+	start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	rm -f /var/run/$NAME/*
+	return "$RETVAL"
+}
+
+#
+# Function that stops the daemon/service
+#
+do_graceful_stop()
+{
+	PID=`cat $PIDFILE`
+	kill -INT $PID
+	# Old nodepoold used USR1
+	# New nodepoold ignores it while INT is being handled
+	kill -USR1 $PID
+
+	# wait until really stopped
+	if [ -n "${PID:-}" ]; then
+		i=0
+		while kill -0 "${PID:-}" 2> /dev/null;  do
+			if [ $i -eq '0' ]; then
+				echo -n " ... waiting "
+			else
+				echo -n "."
+			fi
+			i=$(($i+1))
+			sleep 1
+		done
+	fi
+
+	rm -f /var/run/$NAME/*
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	log_daemon_msg "Reloading $DESC" "$NAME"
+	do_reload
+	log_end_msg $?
+	;;
+  restart)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_graceful_stop
+	do_start
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
diff --git a/manifests/init.pp b/manifests/init.pp
index e7ff835..6217bb9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,6 +35,8 @@ class nodepool (
   $scripts_dir = undef,
   $elements_dir = undef,
   $logging_conf_template = 'nodepool/nodepool.logging.conf.erb',
+  $launcher_logging_conf_template = 'nodepool/nodepool-launcher.logging.conf.erb',
+  $deleter_logging_conf_template = 'nodepool/nodepool-deleter.logging.conf.erb',
   $builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
   $jenkins_masters = [],
   $build_workers = '1',
@@ -43,6 +45,7 @@ class nodepool (
   $mysql_db_name = 'nodepool',
   $mysql_host = 'localhost',
   $mysql_user_name = 'nodepool',
+  $split_daemon = false,
 ) {
 
   if($install_mysql) {
@@ -247,6 +250,54 @@ class nodepool (
     content => template($logging_conf_template),
   }
 
+  if ($split_daemon) {
+    file { '/etc/nodepool/launcher-logging.conf':
+      ensure  => present,
+      mode    => '0444',
+      owner   => 'root',
+      group   => 'root',
+      content => template($launcher_logging_conf_template),
+    }
+
+    file { '/etc/nodepool/deleter-logging.conf':
+      ensure  => present,
+      mode    => '0444',
+      owner   => 'root',
+      group   => 'root',
+      content => template($deleter_logging_conf_template),
+    }
+
+    file { '/etc/init.d/nodepool-launcher':
+      ensure => present,
+      mode   => '0555',
+      owner  => 'root',
+      group  => 'root',
+      source => 'puppet:///modules/nodepool/nodepool-launcher.init',
+    }
+
+    service { 'nodepool-launcher':
+      name       => 'nodepool-launcher',
+      enable     => true,
+      hasrestart => true,
+      require    => File['/etc/init.d/nodepool-launcher'],
+    }
+
+    file { '/etc/init.d/nodepool-deleter':
+      ensure => present,
+      mode   => '0555',
+      owner  => 'root',
+      group  => 'root',
+      source => 'puppet:///modules/nodepool/nodepool-deleter.init',
+    }
+
+    service { 'nodepool-deleter':
+      name       => 'nodepool-deleter',
+      enable     => true,
+      hasrestart => true,
+      require    => File['/etc/init.d/nodepool-deleter'],
+    }
+  }
+
   validate_array($jenkins_masters)
   file { '/etc/nodepool/secure.conf':
     ensure  => present,
diff --git a/templates/nodepool-deleter.default.erb b/templates/nodepool-deleter.default.erb
new file mode 100644
index 0000000..d71ebc8
--- /dev/null
+++ b/templates/nodepool-deleter.default.erb
@@ -0,0 +1,8 @@
+<% if @statsd_host != nil && @statsd_host != "" -%>
+export STATSD_HOST=<%= @statsd_host %>
+export STATSD_PORT=8125
+<% end -%>
+<% @environment.keys.sort.each do |key| -%>
+export <%= key %>='<%= @environment[key] %>'
+<% end -%>
+DAEMON_ARGS="--no-builder -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/deleter-logging.conf --no-launches --no-webapp --no-images"
diff --git a/templates/nodepool-deleter.logging.conf.erb b/templates/nodepool-deleter.logging.conf.erb
new file mode 100644
index 0000000..75c73a4
--- /dev/null
+++ b/templates/nodepool-deleter.logging.conf.erb
@@ -0,0 +1,54 @@
+[loggers]
+keys=root,nodepool,requests,shade
+
+[handlers]
+keys=console,debug,normal
+
+[formatters]
+keys=simple
+
+[logger_root]
+level=WARNING
+handlers=console
+
+[logger_requests]
+level=WARNING
+handlers=debug,normal
+qualname=requests
+
+[logger_shade]
+level=WARNING
+handlers=debug,normal
+qualname=shade
+
+[logger_gear]
+level=DEBUG
+handlers=debug,normal
+qualname=gear
+
+[logger_nodepool]
+level=DEBUG
+handlers=debug,normal
+qualname=nodepool
+
+[handler_console]
+level=WARNING
+class=StreamHandler
+formatter=simple
+args=(sys.stdout,)
+
+[handler_debug]
+level=DEBUG
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/deleter-debug.log', 'H', 8, 30,)
+
+[handler_normal]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/nodepool-deleter.log', 'H', 8, 30,)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=
diff --git a/templates/nodepool-launcher.default.erb b/templates/nodepool-launcher.default.erb
new file mode 100644
index 0000000..3c6757c
--- /dev/null
+++ b/templates/nodepool-launcher.default.erb
@@ -0,0 +1,8 @@
+<% if @statsd_host != nil && @statsd_host != "" -%>
+export STATSD_HOST=<%= @statsd_host %>
+export STATSD_PORT=8125
+<% end -%>
+<% @environment.keys.sort.each do |key| -%>
+export <%= key %>='<%= @environment[key] %>'
+<% end -%>
+DAEMON_ARGS="--no-builder -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/launcher-logging.conf --no-deletes --no-webapp --no-images"
diff --git a/templates/nodepool-launcher.logging.conf.erb b/templates/nodepool-launcher.logging.conf.erb
new file mode 100644
index 0000000..56dbcc0
--- /dev/null
+++ b/templates/nodepool-launcher.logging.conf.erb
@@ -0,0 +1,54 @@
+[loggers]
+keys=root,nodepool,requests,shade
+
+[handlers]
+keys=console,debug,normal
+
+[formatters]
+keys=simple
+
+[logger_root]
+level=WARNING
+handlers=console
+
+[logger_requests]
+level=WARNING
+handlers=debug,normal
+qualname=requests
+
+[logger_shade]
+level=WARNING
+handlers=debug,normal
+qualname=shade
+
+[logger_gear]
+level=DEBUG
+handlers=debug,normal
+qualname=gear
+
+[logger_nodepool]
+level=DEBUG
+handlers=debug,normal
+qualname=nodepool
+
+[handler_console]
+level=WARNING
+class=StreamHandler
+formatter=simple
+args=(sys.stdout,)
+
+[handler_debug]
+level=DEBUG
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/launcher-debug.log', 'H', 8, 30,)
+
+[handler_normal]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/nodepool-launcher.log', 'H', 8, 30,)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=
diff --git a/templates/nodepool.default.erb b/templates/nodepool.default.erb
index 58c0af4..3cc5a75 100644
--- a/templates/nodepool.default.erb
+++ b/templates/nodepool.default.erb
@@ -5,4 +5,8 @@ export STATSD_PORT=8125
 <% @environment.keys.sort.each do |key| -%>
 export <%= key %>='<%= @environment[key] %>'
 <% end -%>
+<% if @split_daemon -%>
+DAEMON_ARGS="--no-builder -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/logging.conf --no-launches --no-deletes"
+<% else -%>
 DAEMON_ARGS="--no-builder -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/logging.conf"
+<% end -%>