diff --git a/facts/general/system.yml b/facts/general/system.yml
index 5371e82..94c697f 100644
--- a/facts/general/system.yml
+++ b/facts/general/system.yml
@@ -46,6 +46,6 @@
 - name: General | Facts | System | Reports
   set_fact:
     heartbeat_report: "{{ report_location }}/{{ ansible_hostname }}.txt"
-    lynis_report: "{{ report_location }}/{{ ansible_hostname }}_lynis.txt"
-    nmap_report: "{{ report_location }}/{{ ansible_hostname }}_nmap.txt"
-    ansible_pull_report: "{{ report_location }}/{{ ansible_hostname }}_last_pull_times.txt"
\ No newline at end of file
+    lynis_report: "{{ report_location }}/lynis/{{ ansible_hostname }}_lynis.txt"
+    nmap_report: "{{ report_location }}/nmap/{{ ansible_hostname }}_nmap.txt"
+    ansible_pull_report: "{{ report_location }}/pull/{{ ansible_hostname }}_last_pull_times.txt"
\ No newline at end of file