diff --git a/operation-tools/install_sf_daq_broker.yml b/operation-tools/install_sf_daq_broker.yml
index d39595a..f1b9305 100644
--- a/operation-tools/install_sf_daq_broker.yml
+++ b/operation-tools/install_sf_daq_broker.yml
@@ -28,25 +28,11 @@
       - { src: 'templates/sf-daq_writer@.service',            dest: '/etc/systemd/system/sf-daq_writer@.service' }
       - { src: 'templates/sf-daq_writers.service',            dest: '/etc/systemd/system/sf-daq_writers.service' }
 
+- import_playbook: install_sf_daq_buffer.yml
+  vars:
+      host: '{{ host }}'
 
-- name: install sf_daq_buffer
-  hosts: '{{ host }}'
-  become: true
-  become_user: dbe
-  tasks:
-    - name: Create service directory
-      file:
-        path: /home/dbe/service_scripts
-        state: directory
-    - name: install setup script
-      template:
-          src: templates/sf_daq_buffer.setup.new.sh
-          dest: /home/dbe/service_scripts/sf_daq_buffer.setup.sh 
-          mode: '0755'
-    - name: execute setup script
-      shell: /home/dbe/service_scripts/sf_daq_buffer.setup.sh
-
-- name: install cleanup service for the buffer
+- name: install cleanup service for the detector buffer
   hosts: '{{ host }}'
   become: true
   become_user: dbe
diff --git a/operation-tools/install_sf_daq_buffer.yml b/operation-tools/install_sf_daq_buffer.yml
index 84e3e74..77d1e3b 100644
--- a/operation-tools/install_sf_daq_buffer.yml
+++ b/operation-tools/install_sf_daq_buffer.yml
@@ -28,6 +28,7 @@
         - { src: jf_buffer_writer, dest: jf_buffer_writer }
         - { src: sf_stream,        dest: sf_stream }
         - { src: jf_assembler,     dest: jf_assembler }
+        - { src: sf_writer,        dest: sf_writer }
     - name: install check for changes in configuration file script
       template:
           src: templates/check_config_changed.sh