diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 98cc0e2..a597f93 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Export assembly documentation
         run: |
           kicad-cli sch export bom -o ${workflow_project_dir}/outputs/raw-BOM.csv --fields "Reference,Value,Footprint,LCSC ID" --exclude-dnp --group-by "Val" --sort-asc ${workflow_project_dir}/${kicad_project_name}.kicad_sch
-          kicad-cli pcb export pos -o ${workflow_project_dir}/outputs/raw-CPL.csv --side front --format csv --use-drill-file-origin --exclude-dnp ${workflow_project_dir}/${kicad_project_name}.kicad_pcb
+          kicad-cli pcb export pos -o ${workflow_project_dir}/outputs/raw-CPL.csv --side front --format csv --use-drill-file-origin --exclude-dnp --units mm ${workflow_project_dir}/${kicad_project_name}.kicad_pcb
 
       - name: Convert BOM & CPL to JLC format
         run: |
@@ -49,8 +49,8 @@ jobs:
 
       - name: Export mechanical files
         run: |
-          kicad-cli pcb export gerbers -o ${workflow_project_dir}/outputs/gerbers/ -l "F.Cu,F.Mask,F.Silkscreen,F.Paste,In1.Cu,In2.Cu,B.Cu,B.Mask,B.Silkscreen,B.Paste,Edge.Cuts" --erd --ev --no-protel-ext ${workflow_project_dir}/${kicad_project_name}.kicad_pcb
-          kicad-cli pcb export drill -o ${workflow_project_dir}/outputs/gerbers/ --format gerber ${workflow_project_dir}/${kicad_project_name}.kicad_pcb
+          kicad-cli pcb export gerbers -o ${workflow_project_dir}/outputs/gerbers/ -l "F.Cu,F.Mask,F.Silkscreen,F.Paste,In1.Cu,In2.Cu,B.Cu,B.Mask,B.Silkscreen,B.Paste,Edge.Cuts" --erd --ev --no-protel-ext --use-drill-file-origin ${workflow_project_dir}/${kicad_project_name}.kicad_pcb
+          kicad-cli pcb export drill -o ${workflow_project_dir}/outputs/gerbers/ --drill-origin plot --format gerber ${workflow_project_dir}/${kicad_project_name}.kicad_pcb
           cd ${workflow_project_dir}/outputs
           zip -r ${kicad_project_name}-gerbers.zip gerbers
           sudo rm -r gerbers