diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index a7ec257..f15e88e 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -80,12 +80,182 @@ jobs:
             target-type: template_release
             os: ubuntu-20.04
 
+          # - platform: windows
+          #   float-precision: single
+          #   arch: x86_32
+          #   target-type: template_release
+          #   os: windows-latest
+
+          # - platform: windows
+          #   float-precision: single
+          #   arch: x86_64
+          #   target-type: template_release
+          #   os: windows-latest
+
+          # - platform: macos
+          #   float-precision: single
+          #   arch: universal
+          #   target-type: template_release
+          #   os: macos-latest
+
+          # - platform: android
+          #   float-precision: single
+          #   arch: arm64
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: android
+          #   float-precision: single
+          #   arch: arm32
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: android
+          #   float-precision: single
+          #   arch: x86_64
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: android
+          #   float-precision: single
+          #   arch: x86_32
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: ios
+          #   float-precision: single
+          #   arch: arm64
+          #   target-type: template_release
+          #   os: macos-latest
+
+          # - platform: web
+          #   float-precision: single
+          #   arch: wasm32
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
         # Double precision templates
+        # Double precision debug templates
+          - platform: linux
+            float-precision: double
+            arch: x86_64
+            target-type: template_debug
+            os: ubuntu-20.04
+
+          - platform: windows
+            float-precision: double
+            arch: x86_32
+            target-type: template_debug
+            os: windows-latest
+
+          - platform: windows
+            float-precision: double
+            arch: x86_64
+            target-type: template_debug
+            os: windows-latest
+
+          - platform: macos
+            float-precision: double
+            arch: universal
+            target-type: template_debug
+            os: macos-latest
+
+          - platform: android
+            float-precision: double
+            arch: arm64
+            target-type: template_debug
+            os: ubuntu-20.04
+
+          - platform: android
+            float-precision: double
+            arch: arm32
+            target-type: template_debug
+            os: ubuntu-20.04
+
+          - platform: android
+            float-precision: double
+            arch: x86_64
+            target-type: template_debug
+            os: ubuntu-20.04
+
+          - platform: android
+            float-precision: double
+            arch: x86_32
+            target-type: template_debug
+            os: ubuntu-20.04
+
+          - platform: ios
+            float-precision: double
+            arch: arm64
+            target-type: template_debug
+            os: macos-latest
+
+          - platform: web
+            float-precision: double
+            arch: wasm32
+            target-type: template_debug
+            os: ubuntu-20.04
+
+        # Double precision release templates
           - platform: linux
             float-precision: double
             arch: x86_64
             target-type: template_release
             os: ubuntu-20.04
+
+          # - platform: windows
+          #   float-precision: double
+          #   arch: x86_32
+          #   target-type: template_release
+          #   os: windows-latest
+
+          # - platform: windows
+          #   float-precision: double
+          #   arch: x86_64
+          #   target-type: template_release
+          #   os: windows-latest
+
+          # - platform: macos
+          #   float-precision: double
+          #   arch: universal
+          #   target-type: template_release
+          #   os: macos-latest
+
+          # - platform: android
+          #   float-precision: double
+          #   arch: arm64
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: android
+          #   float-precision: double
+          #   arch: arm32
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: android
+          #   float-precision: double
+          #   arch: x86_64
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: android
+          #   float-precision: double
+          #   arch: x86_32
+          #   target-type: template_release
+          #   os: ubuntu-20.04
+
+          # - platform: ios
+          #   float-precision: double
+          #   arch: arm64
+          #   target-type: template_release
+          #   os: macos-latest
+
+          # - platform: web
+          #   float-precision: double
+          #   arch: wasm32
+          #   target-type: template_release
+          #   os: ubuntu-20.04
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -130,6 +300,9 @@ jobs:
           name: godot-cpp-template-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.float-precision }}-${{ matrix.target-type }}
           path: |
             ${{ github.workspace }}/bin/**
+
+  # Merges all the build artifacts together into a single godot-cpp-template artifact.
+  # If you comment out this step, all the builds will be uploaded individually.
   merge:
     runs-on: ubuntu-20.04
     needs: build