diff --git a/.forgejo/workflows/draft-release.yaml b/.forgejo/workflows/draft-release.yaml
index c34a896..b281603 100644
--- a/.forgejo/workflows/draft-release.yaml
+++ b/.forgejo/workflows/draft-release.yaml
@@ -1,89 +1,46 @@
 on: [ workflow_dispatch ]
+env:
+  MANIFEST: "module.json"
 jobs:
-  create-artifacts:
-    name: "Create artifacts"
+  create-draft-release:
+    name: "Create Draft Release"
     runs-on: act
+    outputs:
+      version: ${{steps.version.outputs.version}}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install dependencies
         run: npm clean-install
 
       - id: version
-        run: cat module.json | echo version=`jq -r ".version"` >> "$FORGEJO_OUTPUT"
+        run: cat system.json | echo version=`jq -r ".version"` >> "$FORGEJO_OUTPUT"
 
       - name: Assert that the tag doesn't exist
-        run: node scripts/tagExists.mjs
+        run: node scripts/src/tagExists.mjs
         env:
           TAG_NAME: "v${{steps.version.outputs.version}}"
 
-      - name: Compress files
-        run: zip -r release.zip langs module styles templates README.md assets
-
-      - name: Upload artifacts
-        uses: https://data.forgejo.org/forgejo/upload-artifact@v4
-        with:
-          path: |
-            module.json
-            release.zip
-            scripts/*.mjs
-            package-lock.json
-            package.json
-          retention-days: 7
-          if-no-files-found: error
-
-
-  forgejo-release:
-    name: "Create Forgejo release"
-    runs-on: act
-    needs:
-      - create-artifacts
-    steps:
-      - name: Download artifacts
-        uses: https://data.forgejo.org/forgejo/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Install dependencies
-        run: npm i
-
-      - id: version
-        run: cat module.json | echo version=`jq -r ".version"` >> "$FORGEJO_OUTPUT"
+      # Compendia steps
+      - name: Build compendia
+        run: "npm run data:build"
+      - name: Remove compendia source
+        run: "rm -rf packs/**/_source"
 
       - name: Update manifest
-        run: node scripts/prepareManifest.mjs
+        run: node scripts/src/prepareManifest.mjs
         env:
           DOWNLOAD_URL: "${{forgejo.server_url}}/${{forgejo.repository}}/releases/download/v${{steps.version.outputs.version}}/release.zip"
-          LATEST_URL: "${{forgejo.server_url}}/${{forgejo.repository}}/releases/download/latest/module.json"
+          LATEST_URL: "${{forgejo.server_url}}/${{forgejo.repository}}/releases/download/latest/system.json"
 
-      - name: Add manifest into release archive
-        run: zip release.zip --update module.json
+      - name: Compress files
+        run: zip -r release.zip langs module styles templates README.md assets LICENSE
 
-      - name: Upload archive to s3
-        run: node scripts/uploadToS3.mjs
-        env:
-          TAG: "v${{steps.version.outputs.version}}"
-          FILE: "release.zip"
-          S3_BUCKET: "${{vars.S3_BUCKET}}"
-          S3_REGION: "${{vars.S3_REGION}}"
-          S3_KEY: "${{secrets.S3_KEY}}"
-          S3_SECRET: "${{secrets.S3_SECRET}}"
-          S3_ENDPOINT: "${{vars.S3_ENDPOINT}}"
-
-      - name: Upload manifest to s3
-        run: node scripts/uploadToS3.mjs
-        env:
-          TAG: "v${{steps.version.outputs.version}}"
-          FILE: "module.json"
-          S3_BUCKET: "${{vars.S3_BUCKET}}"
-          S3_REGION: "${{vars.S3_REGION}}"
-          S3_KEY: "${{secrets.S3_KEY}}"
-          S3_SECRET: "${{secrets.S3_SECRET}}"
-          S3_ENDPOINT: "${{vars.S3_ENDPOINT}}"
-
-      - name: Create draft release
-        run: node scripts/createForgejoRelease.mjs
+      - name: Create forgejo release
+        run: node scripts/src/createForgejoRelease.mjs
         env:
           TAG: "v${{steps.version.outputs.version}}"
           CDN_URL: "${{vars.CDN_URL}}"