diff --git a/.github/workflows/release-classic.yml b/.github/workflows/release-classic.yml
new file mode 100644
index 0000000000..49965ec674
--- /dev/null
+++ b/.github/workflows/release-classic.yml
@@ -0,0 +1,48 @@
+name: Release Classic
+
+on:
+  push:
+    tags:
+      - 'corne-classic-v[0-9]+.[0-9]+*'
+
+jobs:
+  release-gerber-files:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Export corne-classic gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: corne-classic/gerber
+        board: corne-classic/pcb/corne-classic.kicad_pcb
+        schema: corne-classic/pcb/corne-classic.sch
+    - name: Export top plate gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: plates/pcb/top/gerber
+        board: plates/pcb/top/corne-top-plate.kicad_pcb
+        schema: plates/pcb/top/corne-top-plate.sch
+    - name: Export bottom plate gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: plates/pcb/bottom/gerber
+        board: plates/pcb/bottom/corne-bottom-plate.kicad_pcb
+        schema: plates/pcb/bottom/corne-bottom-plate.sch
+
+    - name: Zip Gerber files
+      run: |
+          zip -r --junk-paths corne-classic-gerber.zip corne-classic/gerber
+          zip -r --junk-paths plates-top-gerber.zip plates/pcb/top/gerber
+          zip -r --junk-paths plates-bottom-gerber.zip plates/pcb/bottom/gerber
+
+    - name: Release to GiHub
+      uses: softprops/action-gh-release@v1
+      with:
+        files: "*.zip"
+        draft: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-corne-cherry.yml b/.github/workflows/release-corne-cherry.yml
new file mode 100644
index 0000000000..ffe80363be
--- /dev/null
+++ b/.github/workflows/release-corne-cherry.yml
@@ -0,0 +1,48 @@
+name: Release Corne Cherry
+
+on:
+  push:
+    tags:
+      - 'corne-cherry-v[0-9]+.[0-9]+*'
+
+jobs:
+  release-gerber-files:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Export corne-cherry gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: corne-cherry/gerber
+        board: corne-cherry/pcb/corne-cherry.kicad_pcb
+        schema: corne-cherry/pcb/corne-cherry.sch
+    - name: Export top plate gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: plates/pcb/top/gerber
+        board: plates/pcb/top/corne-top-plate.kicad_pcb
+        schema: plates/pcb/top/corne-top-plate.sch
+    - name: Export bottom plate gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: plates/pcb/bottom/gerber
+        board: plates/pcb/bottom/corne-bottom-plate.kicad_pcb
+        schema: plates/pcb/bottom/corne-bottom-plate.sch
+
+    - name: Zip Gerber files
+      run: |
+          zip -r --junk-paths corne-cherry-gerber.zip corne-cherry/gerber
+          zip -r --junk-paths plates-top-gerber.zip plates/pcb/top/gerber
+          zip -r --junk-paths plates-bottom-gerber.zip plates/pcb/bottom/gerber
+
+    - name: Release to GiHub
+      uses: softprops/action-gh-release@v1
+      with:
+        files: "*.zip"
+        draft: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release-corne-chocolate.yml
similarity index 57%
rename from .github/workflows/release.yml
rename to .github/workflows/release-corne-chocolate.yml
index b2859272ad..e1e9f03878 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release-corne-chocolate.yml
@@ -1,9 +1,9 @@
-name: Release
+name: Release Corne Chocolate
 
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+*'
+      - 'corne-chocolate-v[0-9]+.[0-9]+*'
 
 jobs:
   release-gerber-files:
@@ -11,13 +11,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Export corne-cherry gerber
-      uses: nerdyscout/kicad-exports@v2.0
-      with:
-        config: .kiplot.yml
-        dir: corne-cherry/gerber
-        board: corne-cherry/pcb/corne-cherry.kicad_pcb
-        schema: corne-cherry/pcb/corne-cherry.sch
     - name: Export corne-chocolate gerber
       uses: nerdyscout/kicad-exports@v2.0
       with:
@@ -25,20 +18,6 @@ jobs:
         dir: corne-chocolate/gerber
         board: corne-chocolate/pcb/corne-chocolate.kicad_pcb
         schema: corne-chocolate/pcb/corne-chocolate.sch
-    - name: Export corne-classic gerber
-      uses: nerdyscout/kicad-exports@v2.0
-      with:
-        config: .kiplot.yml
-        dir: corne-classic/gerber
-        board: corne-classic/pcb/corne-classic.kicad_pcb
-        schema: corne-classic/pcb/corne-classic.sch
-    - name: Export corne-light gerber
-      uses: nerdyscout/kicad-exports@v2.0
-      with:
-        config: .kiplot.yml
-        dir: corne-light/gerber
-        board: corne-light/pcb/corne-light.kicad_pcb
-        schema: corne-light/pcb/corne-light.sch
     - name: Export top plate gerber
       uses: nerdyscout/kicad-exports@v2.0
       with:
@@ -56,10 +35,7 @@ jobs:
 
     - name: Zip Gerber files
       run: |
-          zip -r --junk-paths corne-cherry-gerber.zip corne-cherry/gerber
           zip -r --junk-paths corne-chocolate-gerber.zip corne-chocolate/gerber
-          zip -r --junk-paths corne-light-gerber.zip corne-light/gerber
-          zip -r --junk-paths corne-classic-gerber.zip corne-classic/gerber
           zip -r --junk-paths plates-top-gerber.zip plates/pcb/top/gerber
           zip -r --junk-paths plates-bottom-gerber.zip plates/pcb/bottom/gerber
 
diff --git a/.github/workflows/release-corne-light.yml b/.github/workflows/release-corne-light.yml
new file mode 100644
index 0000000000..d1f2491af6
--- /dev/null
+++ b/.github/workflows/release-corne-light.yml
@@ -0,0 +1,48 @@
+name: Release Corne Light
+
+on:
+  push:
+    tags:
+      - 'corne-light-v[0-9]+.[0-9]+*'
+
+jobs:
+  release-gerber-files:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Export corne-light gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: corne-light/gerber
+        board: corne-light/pcb/corne-light.kicad_pcb
+        schema: corne-light/pcb/corne-light.sch
+    - name: Export top plate gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: plates/pcb/top/gerber
+        board: plates/pcb/top/corne-top-plate.kicad_pcb
+        schema: plates/pcb/top/corne-top-plate.sch
+    - name: Export bottom plate gerber
+      uses: nerdyscout/kicad-exports@v2.0
+      with:
+        config: .kiplot.yml
+        dir: plates/pcb/bottom/gerber
+        board: plates/pcb/bottom/corne-bottom-plate.kicad_pcb
+        schema: plates/pcb/bottom/corne-bottom-plate.sch
+
+    - name: Zip Gerber files
+      run: |
+          zip -r --junk-paths corne-light-gerber.zip corne-light/gerber
+          zip -r --junk-paths plates-top-gerber.zip plates/pcb/top/gerber
+          zip -r --junk-paths plates-bottom-gerber.zip plates/pcb/bottom/gerber
+
+    - name: Release to GiHub
+      uses: softprops/action-gh-release@v1
+      with:
+        files: "*.zip"
+        draft: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}