diff --git a/kicad_ci_test.kiplot.yaml b/kicad_ci_test.kiplot.yaml
index 65401e7..b97fb6d 100644
--- a/kicad_ci_test.kiplot.yaml
+++ b/kicad_ci_test.kiplot.yaml
@@ -48,7 +48,28 @@ outputs:
     dir: BoM
     options:
       blacklist: 'DNF*'
+      name_format: '%f_%r_iBoM'
 
+  - name: 'bom_html'
+    comment: "Bill of Materials in HTML format"
+    type: kibom
+    dir: BoM
+    options:
+      format: HTML  # HTML or CSV
+
+  - name: 'bom_xlsx'
+    comment: "Bill of Materials in XLSX format"
+    type: kibom
+    dir: BoM
+    options:
+      format: XLSX
+
+  - name: 'bom_csv'
+    comment: "Bill of Materials in CSV format"
+    type: kibom
+    dir: BoM
+    options:
+      format: CSV  # HTML or CSV
 
   - name: 'gerbers'
     comment: "Gerbers for the board house"
@@ -83,58 +104,6 @@ outputs:
       # - layer: Edge.Cuts
       #   suffix: Edge_Cuts
 
-  - name: 'bom_html'
-    comment: "Bill of Materials in HTML format"
-    type: bom
-    dir: BoM
-    options: &bom_options
-      columns:
-        - Row
-        - field: References
-          name: Referencias
-        - field: Part
-          name: Parte
-        - field: Value
-          name: Valor
-        # - field: manf#
-        #   name: P/N
-        # - field: manf
-        #   name: Fabricante
-        # - field: digikey#
-        #   name: 'Cod. Digi-Key'
-        - Footprint
-        - field: Desc
-          name: Descripción
-        - 'Quantity Per PCB'
-      group_fields:  ['Part']
-      normalize_values: true
-      normalize_locale: true
-      # exclude_filter: 'exclude_any'
-      html:
-        # logo: '../images/inti.png'
-        # digikey_link: 'digikey#'
-        highlight_empty: false
-
-  - name: 'bom_xlsx'
-    comment: "Bill of Materials in XLSX format"
-    type: bom
-    dir: BoM
-    options:
-      <<: *bom_options
-      format: XLSX
-      xlsx:
-        # logo: '../images/inti.png'
-        # digikey_link: 'digikey#'
-        highlight_empty: false
-
-  - name: 'bom_csv'
-    comment: "Bill of Materials in CSV format"
-    type: bom
-    dir: BoM
-    options:
-      <<: *bom_options
-      format: CSV
-
   - name: excellon_drill
     comment: "Excellon drill files"
     type: excellon