diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
new file mode 100644
index 0000000..069306b
--- /dev/null
+++ b/.gitea/workflows/build.yml
@@ -0,0 +1,72 @@
+on: [push, pull_request, workflow_dispatch]
+
+name: Build
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: zmkfirmware/zmk-build-arm:stable
+    name: Build
+    steps:
+      - name: Install Dependencies
+        run: apt update; apt install -y nodejs ssh
+      - name: Setup Node
+        uses: actions/setup-node@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Cache west modules
+        uses: https://github.com/actions/cache@v2
+        env:
+          cache-name: cache-zephyr-modules
+        with:
+          path: |
+            modules/
+            tools/
+            zephyr/
+            bootloader/
+            zmk/
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: West Init
+        run: west init -l config
+      - name: West Update
+        run: west update
+      - name: West Zephyr export
+        run: west zephyr-export
+
+      - name: West Build (Corne Left)
+        run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
+      - name: Corne Left Kconfig file
+        run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
+    # - name: Rename zmk.uf2
+    #   run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
+    # - name: Archive (Corne Left)
+    #   uses: https://github.com/actions/upload-artifact@v3
+    #   with:
+    #     name: firmware
+    #     path: corne_left_nice_nano_v2.uf2
+
+      - name: West Build (Corne Right)
+        run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
+      - name: Corne Right Kconfig file
+        run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
+    # - name: Rename zmk.uf2
+    #   run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
+    # - name: Archive (Corne Right)
+    #   uses: https://github.com/actions/upload-artifact@v3
+    #   with:
+    #     name: firmware
+    #     path: corne_right_nice_nano_v2.uf2
+    #       - name: Release
+
+    # - name: Upload artifacts as release
+    #   uses: https://github.com/softprops/action-gh-release@v1
+    #   if: startsWith(github.ref, 'refs/tags/')
+    #   with:
+    #     files: |
+    #       corne_left_nice_nano_v2.uf2
+    #       corne_right_nice_nano_v2.uf2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 069306b..4a3a8ff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,31 +42,31 @@ jobs:
         run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
       - name: Corne Left Kconfig file
         run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
-    # - name: Rename zmk.uf2
-    #   run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
-    # - name: Archive (Corne Left)
-    #   uses: https://github.com/actions/upload-artifact@v3
-    #   with:
-    #     name: firmware
-    #     path: corne_left_nice_nano_v2.uf2
+      - name: Rename zmk.uf2
+        run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
+      - name: Archive (Corne Left)
+        uses: https://github.com/actions/upload-artifact@v3
+        with:
+          name: firmware
+          path: corne_left_nice_nano_v2.uf2
 
       - name: West Build (Corne Right)
         run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
       - name: Corne Right Kconfig file
         run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
-    # - name: Rename zmk.uf2
-    #   run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
-    # - name: Archive (Corne Right)
-    #   uses: https://github.com/actions/upload-artifact@v3
-    #   with:
-    #     name: firmware
-    #     path: corne_right_nice_nano_v2.uf2
-    #       - name: Release
+      - name: Rename zmk.uf2
+        run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
+      - name: Archive (Corne Right)
+        uses: https://github.com/actions/upload-artifact@v3
+        with:
+          name: firmware
+          path: corne_right_nice_nano_v2.uf2
+            - name: Release
 
-    # - name: Upload artifacts as release
-    #   uses: https://github.com/softprops/action-gh-release@v1
-    #   if: startsWith(github.ref, 'refs/tags/')
-    #   with:
-    #     files: |
-    #       corne_left_nice_nano_v2.uf2
-    #       corne_right_nice_nano_v2.uf2
+      - name: Upload artifacts as release
+        uses: https://github.com/softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            corne_left_nice_nano_v2.uf2
+            corne_right_nice_nano_v2.uf2