diff --git a/default.kibot.yaml b/default.kibot.yaml
index b87f2aa..d35730c 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -7,6 +7,7 @@ import:
     definitions:  
       _KIBOT_POS_ENABLED: false
       _KIBOT_BOM_ENABLED: false
+      _KIBOT_MANF_DIR_COMP: "%f-%r"
 
 preflight:
   run_erc: true
@@ -34,14 +35,14 @@ outputs:
     type: pdf_sch_print
     dir: .
     options:
-      output: Schematic.pdf
+      output: "%f_%r_%i.%x"
 
   - name: 'print_pcb'
     comment: "Print Top and Bottom Copper+Silk"
     type: pcb_print
     dir: .
     options:
-      output_name: PCB.pdf
+      output: "%f_%r_%i.%x"
       pages: 
         - layers:
           - layer: F.Cu
@@ -52,8 +53,7 @@ outputs:
           - layer: B.SilkS
           - layer: Edge.Cuts
 
-  - name: 'bom'
-    comment: "BOM in csv format"
+  - name: '_bom'
     type: bom
     dir: .
     options:
@@ -68,18 +68,37 @@ outputs:
         - manf
         - field: References
           name: refs 
+      exclude_filter: ""
+    disable_run_by_default: true
+
+  - name: 'bom_csv'  
+    type: bom
+    dir: .
+    extends: "_bom"
+    options:
       csv:
         separator: ';'
         hide_pcb_info: true
         hide_stats_info: true
       format: "CSV"
-      exclude_filter: ""
+      output: "%f_%r_%i.%x"
 
-  - name: 'drill'
-    comment: "excellon drill files"
-    type: excellon
-    dir: Gerbers
-    # options:
+  - name: 'bom_xlsx'  
+    type: bom
+    dir: .
+    extends: '_bom' 
+    options:
+      xlsx:
+        logo: "${CI_PROJECT_DIR}/.gitlab/micromelon_default/meta/icon.png"
+        hide_pcb_info: true
+        hide_stats_info: true
+      format: "xlsx"
+
+  # - name: 'drill'
+  #   comment: "excellon drill files"
+  #   type: excellon
+  #   dir: Gerbers
+  #   # options:
 
   - name: 'step'
     comment: "Step file of pcb"
@@ -94,7 +113,7 @@ outputs:
     comment: "Pick and place"
     type: position
     options:
-      output: '%f_cpl.%x'
+      output: '%f_%r_cpl.%x'
       format: CSV
       units: millimeters
       separate_files_for_front_and_back: false
@@ -104,6 +123,8 @@ outputs:
     comment: '3D printable stencil for when you forgot to order it'
     type: stencil_3d
     dir: '3D Stencil'
+    options: 
+      output: '%f_%r_%i.%x'
 
   - name: 'diff_pcb'
     comment: "Diff for visual comparison"
@@ -132,5 +153,6 @@ groups:
 
   - name: sch
     outputs:
-      - bom
+      - bom_csv
+      - bom_xlsx
       - print_sch