diff --git a/defaults/main.yaml b/defaults/main.yaml
index 377d4f2..68394ad 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -25,7 +25,9 @@ nodepool_scripts_dir_dest: /etc/nodepool/scripts
 
 nodepool_config_database_dburi: "sqlite:///{{ nodepool_user_home }}/nodepool.db"
 nodepool_config_elements_dir: "{{ nodepool_elements_dir_dest }}"
-nodepool_config_gearman_servers: []
+nodepool_config_gearman_servers:
+  - host: 127.0.0.1
+    port: 4730
 nodepool_config_images_dir: /opt/nodepool/images
 nodepool_config_log_config: /etc/nodepool/logging.conf
 nodepool_config_secure_config: /etc/nodepool/secure.conf
@@ -64,6 +66,13 @@ nodepool_pip_version:
 nodepool_file_nodepool_service_group: root
 nodepool_file_nodepool_service_owner: root
 
-nodepool_service_enabled: yes
-nodepool_service_name: nodepool
-nodepool_service_state: started
+nodepool_file_nodepool_builder_service_group: root
+nodepool_file_nodepool_builder_service_owner: root
+
+nodepool_service_nodepool_enabled: yes
+nodepool_service_nodepool_name: nodepool
+nodepool_service_nodepool_state: started
+
+nodepool_service_nodepool_builder_enabled: yes
+nodepool_service_nodepool_builder_name: nodepool-builder
+nodepool_service_nodepool_builder_state: started
diff --git a/files/etc/init.d/nodepool-builder b/files/etc/init.d/nodepool-builder
new file mode 100644
index 0000000..cc120bc
--- /dev/null
+++ b/files/etc/init.d/nodepool-builder
@@ -0,0 +1,154 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          nodepool-builder
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Nodepool
+# Description:       Trunk gating system
+### END INIT INFO
+
+# 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 Builder"
+NAME=nodepool-builder
+DAEMON=/usr/local/bin/nodepool-builder
+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
+    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
+
+    # 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|status|restart|force-reload}" >&2
+        exit 3
+        ;;
+esac
+
+:
diff --git a/files/etc/systemd/system/nodepool-builder.service b/files/etc/systemd/system/nodepool-builder.service
new file mode 100644
index 0000000..85daa0f
--- /dev/null
+++ b/files/etc/systemd/system/nodepool-builder.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Nodepool Builder Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=nodepool
+Group=nodepool
+EnvironmentFile=-/etc/sysconfig/nodepool
+ExecStart=/usr/bin/nodepool-builder -d -l /etc/nodepool/logging.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/nodepool.service b/files/etc/systemd/system/nodepool.service
index 564aa48..5eba72f 100644
--- a/files/etc/systemd/system/nodepool.service
+++ b/files/etc/systemd/system/nodepool.service
@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool
-ExecStart=/usr/bin/nodepoold -d -l /etc/nodepool/logging.conf
+ExecStart=/usr/bin/nodepoold --no-builder -d -l /etc/nodepool/logging.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tasks/service.yaml b/tasks/service.yaml
index ac41ffa..19865df 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -27,13 +27,28 @@
     nodepool_file_nodepool_service_src: "{{ __nodepool_file_nodepool_service_src }}"
   when: nodepool_file_nodepool_service_src is not defined
 
+- name: Define nodepool_file_nodepool_builder_service_dest.
+  set_fact:
+    nodepool_file_nodepool_builder_service_dest: "{{ __nodepool_file_nodepool_builder_service_dest }}"
+  when: nodepool_file_nodepool_builder_service_dest is not defined
+
+- name: Define nodepool_file_nodepool_builder_service_mode.
+  set_fact:
+    nodepool_file_nodepool_builder_service_mode: "{{ __nodepool_file_nodepool_builder_service_mode }}"
+  when: nodepool_file_nodepool_builder_service_mode is not defined
+
+- name: Define nodepool_file_nodepool_builder_service_src.
+  set_fact:
+    nodepool_file_nodepool_builder_service_src: "{{ __nodepool_file_nodepool_builder_service_src }}"
+  when: nodepool_file_nodepool_builder_service_src is not defined
+
 - include: service/debian.yaml
   when: ansible_os_family == 'Debian'
 
 - include: service/redhat.yaml
   when: ansible_os_family == 'RedHat'
 
-- name: Copy services scripts into place.
+- name: Copy nodepool services scripts into place.
   copy:
     dest: "{{ nodepool_file_nodepool_service_dest }}"
     group: "{{ nodepool_file_nodepool_service_group }}"
@@ -41,8 +56,22 @@
     owner: "{{ nodepool_file_nodepool_service_owner }}"
     src: "{{ nodepool_file_nodepool_service_src }}"
 
+- name: Copy nodepool-builder services scripts into place.
+  copy:
+    dest: "{{ nodepool_file_nodepool_builder_service_dest }}"
+    group: "{{ nodepool_file_nodepool_builder_service_group }}"
+    mode: "{{ nodepool_file_nodepool_builder_service_mode }}"
+    owner: "{{ nodepool_file_nodepool_builder_service_owner }}"
+    src: "{{ nodepool_file_nodepool_builder_service_src }}"
+
 - name: Enable nodepool service.
   service:
-    enabled: "{{ nodepool_service_enabled }}"
-    name: "{{ nodepool_service_name }}"
-    state: "{{ nodepool_service_state }}"
+    enabled: "{{ nodepool_service_nodepool_enabled }}"
+    name: "{{ nodepool_service_nodepool_name }}"
+    state: "{{ nodepool_service_nodepool_state }}"
+
+- name: Enable nodepool-builder service.
+  service:
+    enabled: "{{ nodepool_service_nodepool_builder_enabled }}"
+    name: "{{ nodepool_service_nodepool_builder_name }}"
+    state: "{{ nodepool_service_nodepool_builder_state }}"
diff --git a/tests/test.yaml b/tests/test.yaml
index 060bcb6..c69a540 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -141,3 +141,39 @@
     - name: Ensure nodepoold is running.
       shell: /usr/sbin/service nodepool status
       tags: skip_ansible_lint
+
+    - name: Register /etc/init.d/nodepool-builder
+      stat:
+        path: /etc/init.d/nodepool-builder
+      register: debian_nodepool_builder_service_stat
+      when: ansible_os_family == 'Debian'
+
+    - name: Assert debian_nodepool_builder_service_stat tests.
+      assert:
+        that:
+          - debian_nodepool_builder_service_stat.stat.exists
+          - debian_nodepool_builder_service_stat.stat.isreg
+          - debian_nodepool_builder_service_stat.stat.pw_name == 'root'
+          - debian_nodepool_builder_service_stat.stat.gr_name == 'root'
+          - debian_nodepool_builder_service_stat.stat.mode == '0755'
+      when: ansible_os_family == 'Debian'
+
+    - name: Register /etc/systemd/system/nodepool-builder.service
+      stat:
+        path: /etc/systemd/system/nodepool-builder.service
+      register: redhat_nodepool_builder_service_stat
+      when: ansible_os_family == 'RedHat'
+
+    - name: Assert redhat_nodepool_builder_service_stat tests.
+      assert:
+        that:
+          - redhat_nodepool_builder_service_stat.stat.exists
+          - redhat_nodepool_builder_service_stat.stat.isreg
+          - redhat_nodepool_builder_service_stat.stat.pw_name == 'root'
+          - redhat_nodepool_builder_service_stat.stat.gr_name == 'root'
+          - redhat_nodepool_builder_service_stat.stat.mode == '0644'
+      when: ansible_os_family == 'RedHat'
+
+    - name: Ensure nodepool-builder is running.
+      shell: /usr/sbin/service nodepool-builder status
+      tags: skip_ansible_lint
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
index 03a5350..1a4ef7a 100644
--- a/vars/Debian.yaml
+++ b/vars/Debian.yaml
@@ -36,3 +36,7 @@ __nodepool_build_depends:
 __nodepool_file_nodepool_service_dest: /etc/init.d/nodepool
 __nodepool_file_nodepool_service_mode: "0755"
 __nodepool_file_nodepool_service_src: etc/init.d/nodepool
+
+__nodepool_file_nodepool_builder_service_dest: /etc/init.d/nodepool-builder
+__nodepool_file_nodepool_builder_service_mode: "0755"
+__nodepool_file_nodepool_builder_service_src: etc/init.d/nodepool-builder
diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml
index f9480fd..6a8edc9 100644
--- a/vars/RedHat.yaml
+++ b/vars/RedHat.yaml
@@ -27,3 +27,7 @@ __nodepool_build_depends:
 __nodepool_file_nodepool_service_dest: /etc/systemd/system/nodepool.service
 __nodepool_file_nodepool_service_mode: "0644"
 __nodepool_file_nodepool_service_src: etc/systemd/system/nodepool.service
+
+__nodepool_file_nodepool_builder_service_dest: /etc/systemd/system/nodepool-builder.service
+__nodepool_file_nodepool_builder_service_mode: "0644"
+__nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builder.service