diff --git a/operation-tools/daq10.JF16_JF17.yml b/operation-tools/daq10.JF16_JF17.yml
new file mode 100644
index 0000000..51d293a
--- /dev/null
+++ b/operation-tools/daq10.JF16_JF17.yml
@@ -0,0 +1,49 @@
+- import_playbook: install_sf_daq_buffer.yml
+  vars:
+      host: sf_daq_cristallina
+
+- import_playbook: install_streamvis.yml
+  vars:
+      host: sf_daq_cristallina
+
+- import_playbook: receiver_services_detector.yml
+  vars:
+      host: sf_daq_cristallina
+      detector: "{{ JF16_detector_short_name }}"
+      detector_full_name: "{{ JF16_detector_full_name }}"
+      visualisation_view: "{{ JF16_visualisation_view }}"
+      visualisation_incoming_data_port: "{{ JF16_visualisation_incoming_data_port }}"
+      visualisation_port: "{{ JF16_visualisation_port }}"
+      visualisation_title: "{{ JF16_visualisation_title }}"
+      last_module_number: "{{ JF16_last_module_number }}"
+      initial_udp_port: "{{ JF16_initial_udp_port }}"
+
+      detector_config: "/gpfs/photonics/swissfel/buffer/config/{{ detector_full_name }}.json"
+      visualisation_alias: sf-daq-cristallina
+      visualisation_cores: 24,25
+      stream2vis_cores: 34
+      cores_buffer_writer: 17 17 17
+      cores_udp_recv_receivers: 16 16 16
+      cores_assembler: 10
+
+- import_playbook: receiver_services_detector.yml
+  vars:
+      host: sf_daq_cristallina
+      detector: "{{ JF17_detector_short_name }}"
+      detector_full_name: "{{ JF17_detector_full_name }}"
+      visualisation_view: "{{ JF17_visualisation_view }}"
+      visualisation_incoming_data_port: "{{ JF17_visualisation_incoming_data_port }}"
+      visualisation_port: "{{ JF17_visualisation_port }}"
+      visualisation_title: "{{ JF17_visualisation_title }}"
+      last_module_number: "{{ JF17_last_module_number }}"
+      initial_udp_port: "{{ JF17_initial_udp_port }}"
+
+      detector_config: "/gpfs/photonics/swissfel/buffer/config/{{ detector_full_name }}.json"
+      visualisation_alias: sf-daq-cristallina
+      visualisation_cores: 26,27
+      stream2vis_cores: 35
+      cores_buffer_writer: 2 2 2 2 3 3 3 3 4 4 4 4 5 5 5 5
+      cores_udp_recv_receivers: 6 6 6 6 7 7 7 7 8 8 8 8 9 9 9 9
+      cores_assembler: 11
+
+
diff --git a/operation-tools/inventories/sf-daq b/operation-tools/inventories/sf-daq
index 58e9003..9505446 100644
--- a/operation-tools/inventories/sf-daq
+++ b/operation-tools/inventories/sf-daq
@@ -202,3 +202,13 @@ JF16_visualisation_title=Cristallina-Q1
 JF16_last_module_number=02
 JF16_initial_udp_port=50200
 
+#JF17
+JF17_detector_short_name=JF17
+JF17_detector_full_name=JF17T16V01
+JF17_visualisation_incoming_data_port=9017
+JF17_visualisation_port=5017
+JF17_visualisation_view=large
+JF17_visualisation_title=Cristallina-MX
+JF17_last_module_number=15
+JF17_initial_udp_port=50203
+