diff --git a/.github/actions/import-ses/action.yaml b/.github/actions/import-ses/action.yaml
index 4ed2779..585f293 100644
--- a/.github/actions/import-ses/action.yaml
+++ b/.github/actions/import-ses/action.yaml
@@ -17,9 +17,9 @@ runs:
       for board in ${{ inputs.boards }};
       do
         echo Processing $board
-        if [ -e $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_routed.kicad_pcb ]; then
-          echo Cleaning up $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_routed.kicad_pcb
-          rm -f $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_routed.kicad_pcb
+        if [ -e $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb ]; then
+          echo Cleaning up $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb
+          rm -f $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb
         fi
-        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.ses --output-file $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_routed.kicad_pcb;
+        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.ses --output-file $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb;
       done
\ No newline at end of file
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aa90b0c..b740c53 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -32,10 +32,14 @@ jobs:
         run: npm install
       - name: Generate unrouted PCBs with Ergogen (definition in package.json)
         run: npm run build
-      - name: Run KiBot to generate images, gerbers for the plate files
+      - name: Run KiBot to generate images, gerbers for the plates
         uses: ./.github/actions/kibot
         with:
-          boards: frontplate backplate controller_overlay corney_island 
+          boards: frontplate backplate controller_overlay
+      - name: Run KiBot to generate images, gerbers for the unrouted board
+        uses: ./.github/actions/kibot
+        with:
+          boards: corney_island 
       - name: Export DSN file for Freerouting
         uses: ./.github/actions/export-dsn
         with:
@@ -48,8 +52,12 @@ jobs:
         uses: ./.github/actions/import-ses
         with:
           boards: corney_island
+      - name: Run KiBot to generate images, gerbers for the autorouted board
+        uses: ./.github/actions/kibot
+        with:
+          boards: corney_island_autorouted
       - name: Persist output
         uses: actions/upload-artifact@v3
         with:
-          name: corney_island_unrouted
+          name: corney_island
           path: ergogen/output
diff --git a/build.sh b/build.sh
index 0094d18..aeb21a2 100755
--- a/build.sh
+++ b/build.sh
@@ -62,9 +62,9 @@ do
     fi
     if [ -e ergogen/output/pcbs/${board}.ses ]; then
         echo "Import SES"
-        ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py ergogen/output/pcbs/${board}.kicad_pcb ergogen/output/pcbs/${board}.ses --output-file ergogen/output/pcbs/${board}_routed.kicad_pcb
+        ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py ergogen/output/pcbs/${board}.kicad_pcb ergogen/output/pcbs/${board}.ses --output-file ergogen/output/pcbs/${board}_autorouted.kicad_pcb
     fi
-    if [ -e ergogen/output/pcbs/${board}_routed.kicad_pcb ]; then
-        ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:latest kibot -b ergogen/output/pcbs/${board}_routed.kicad_pcb -c kibot/boards.kibot.yaml
+    if [ -e ergogen/output/pcbs/${board}_autorouted.kicad_pcb ]; then
+        ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:latest kibot -b ergogen/output/pcbs/${board}_autorouted.kicad_pcb -c kibot/boards.kibot.yaml
     fi
 done
diff --git a/ergogen/output/gerbers/backplate.zip b/ergogen/output/gerbers/backplate.zip
index 423374f..0162218 100644
Binary files a/ergogen/output/gerbers/backplate.zip and b/ergogen/output/gerbers/backplate.zip differ
diff --git a/ergogen/output/gerbers/controller_overlay.zip b/ergogen/output/gerbers/controller_overlay.zip
index c24d55d..2395c6f 100644
Binary files a/ergogen/output/gerbers/controller_overlay.zip and b/ergogen/output/gerbers/controller_overlay.zip differ
diff --git a/ergogen/output/gerbers/corney_island.zip b/ergogen/output/gerbers/corney_island.zip
index 0e506d6..e7e8fe7 100644
Binary files a/ergogen/output/gerbers/corney_island.zip and b/ergogen/output/gerbers/corney_island.zip differ
diff --git a/ergogen/output/gerbers/corney_island_autorouted.zip b/ergogen/output/gerbers/corney_island_autorouted.zip
new file mode 100644
index 0000000..ce9aae9
Binary files /dev/null and b/ergogen/output/gerbers/corney_island_autorouted.zip differ
diff --git a/ergogen/output/gerbers/corney_island_manually_routed.zip b/ergogen/output/gerbers/corney_island_manually_routed.zip
index ca75ad9..078eb75 100644
Binary files a/ergogen/output/gerbers/corney_island_manually_routed.zip and b/ergogen/output/gerbers/corney_island_manually_routed.zip differ
diff --git a/ergogen/output/gerbers/corney_island_routed.zip b/ergogen/output/gerbers/corney_island_routed.zip
deleted file mode 100644
index bb62db9..0000000
Binary files a/ergogen/output/gerbers/corney_island_routed.zip and /dev/null differ
diff --git a/ergogen/output/gerbers/frontplate.zip b/ergogen/output/gerbers/frontplate.zip
index ca19abf..b0fe848 100644
Binary files a/ergogen/output/gerbers/frontplate.zip and b/ergogen/output/gerbers/frontplate.zip differ
diff --git a/ergogen/output/images/corney_island_routed-bottom.png b/ergogen/output/images/corney_island_autorouted-bottom.png
similarity index 100%
rename from ergogen/output/images/corney_island_routed-bottom.png
rename to ergogen/output/images/corney_island_autorouted-bottom.png
diff --git a/ergogen/output/images/corney_island_routed-top.png b/ergogen/output/images/corney_island_autorouted-top.png
similarity index 100%
rename from ergogen/output/images/corney_island_routed-top.png
rename to ergogen/output/images/corney_island_autorouted-top.png
diff --git a/ergogen/output/pcbs/corney_island_routed.kicad_pcb b/ergogen/output/pcbs/corney_island_autorouted.kicad_pcb
similarity index 100%
rename from ergogen/output/pcbs/corney_island_routed.kicad_pcb
rename to ergogen/output/pcbs/corney_island_autorouted.kicad_pcb