diff --git a/.github/workflows/create-board.yaml b/.github/workflows/create-board.yaml
index af404d8..1e7ba12 100644
--- a/.github/workflows/create-board.yaml
+++ b/.github/workflows/create-board.yaml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Install kicad
         run: |
-          sudo add-apt-repository --yes ppa:kicad/kicad-7.0-releases
+          sudo add-apt-repository --yes ppa:kicad/kicad-8.0-releases
           sudo apt-get install kicad
           pip install kicad-netlist-reader
 
diff --git a/kicad/bin/export.sh b/kicad/bin/export.sh
index aea7fcd..d3edf41 100755
--- a/kicad/bin/export.sh
+++ b/kicad/bin/export.sh
@@ -51,8 +51,8 @@ echo Export positions file
 kicad-cli pcb export pos --format csv --units mm --use-drill-file-origin --bottom-negate-x "$PCB_FILE" -o "gerber/$IN-all-pos.csv"
 
 echo Getting Drill/Place origin from PCB
-X=$(grep "aux_axis_origin" "$PCB_FILE" | tr -s ' ' | cut -d ' ' -f 3)
-Y=$(grep "aux_axis_origin" "$PCB_FILE" | tr -s ' ' | cut -d ' ' -f 4 | tr -d ')')
+X=$(grep "aux_axis_origin" "$PCB_FILE" | tr '	' ' ' | tr -s ' ' | cut -d ' ' -f 3)
+Y=$(grep "aux_axis_origin" "$PCB_FILE" | tr '	' ' ' | tr -s ' ' | cut -d ' ' -f 4 | tr -d ')')
 if [ ! "$Y" ]; then
     echo "aux_axis_origin is missing in the PCB file"
     exit -1