diff --git a/kibot/yaml/kibot_main.yaml b/kibot/yaml/kibot_main.yaml
index f63add6..cbff0b8 100644
--- a/kibot/yaml/kibot_main.yaml
+++ b/kibot/yaml/kibot_main.yaml
@@ -17,7 +17,6 @@ groups:
   - name: preprocess_group
     outputs:
       - notes
-      - tables
 
   # Draft Outputs Group (used in DRAFT state only) ---------------------------
   - name: draft_group
@@ -54,6 +53,7 @@ groups:
   # Fabrication Outputs ------------------------------------------------------
   - name: fab
     outputs:
+      - tables
       - @GERBER_OUTPUT@
       - @EXCELLON_DRILL_OUTPUT@
       - @ODB_OUTPUT@
@@ -477,7 +477,7 @@ definitions:
   ASSEMBLY_DIR: '@MANUFACTURING_DIR@/assembly'
   FABRICATION_DIR: '@MANUFACTURING_DIR@/fab'
   GERBERS_DIR: '@FABRICATION_DIR@/gerbers'
-  DRILL_TABLES_DIR: '@FABRICATION_DIR@/drill-tables'
+  DRILL_TABLE_DIR: '@FABRICATION_DIR@/drill-tables'
   TESTING_DIR: test
   TESTPOINTS_DIR: '@TESTING_DIR@/testpoints'
   RESOURCES_DIR: kibot