diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0341b41e26..334beb6697 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,12 +14,8 @@ jobs:
     steps:
       - name: Parse Input
         id: parsing
-        run: |
-          if [[ "${{ inputs.packages }}" == pkgs* ]]; then
-            echo "${{ inputs.packages }}" >> $GITHUB_OUTPUT
-          else
-            echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-          fi
+        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+
   build:
     needs: parse
     strategy:
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
new file mode 100644
index 0000000000..9028fd8a31
--- /dev/null
+++ b/.github/workflows/json-build.yml
@@ -0,0 +1,59 @@
+name: Build Packages (JSON)
+on:
+  workflow_dispatch:
+    inputs:
+      packages:
+        description: "Packages to Build"
+        required: true
+
+jobs:
+  build:
+    needs: parse
+    strategy:
+      matrix:
+        pkg: ${{ fromJson(inputs.packages) }}
+        version: ["37"]
+        arch: ["x86_64", "aarch64"]
+      fail-fast: false
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    container:
+      image: ghcr.io/terrapkg/builder:37
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: terrapkg/anda-build@main
+        with:
+          name: "${{ matrix.pkg }}pkg"
+          mockConfig: anda-${{ matrix.version }}-${{ matrix.arch }}
+          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
+          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+
+      - name: Generating artifact name
+        id: art
+        run: |
+          NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }}
+          x=${NAME//\//@}
+          echo "name=$x" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.art.outputs.name }}
+          path: anda-build/rpm/rpms/*
+
+      - name: Upload packages to subatomic
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }} anda-build/rpm/rpms/*
+
+      - name: Notify Madoguchi (Success)
+        if: success()
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+      - name: Notify Madoguchi (Failure)
+        if: cancelled() || failure()
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}