diff --git a/.github/workflows/branches.yaml b/.github/workflows/branches.yaml
index 9f30a828..c543a1f6 100644
--- a/.github/workflows/branches.yaml
+++ b/.github/workflows/branches.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-checks
+      group: ${{ github.workflow }}-${{ github.ref }}-check
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
new file mode 100644
index 00000000..b66932cc
--- /dev/null
+++ b/.github/workflows/main.yaml
@@ -0,0 +1,24 @@
+name: Main
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  check-and-deploy:
+    name: Check and Deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    concurrency: templates-check-and-deploy
+    env:
+      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20.x"
+      - run: npm ci
+      - run: npm run check:ci
+      - run: npm run deploy
diff --git a/d1-template/package.json b/d1-template/package.json
index 03844d6e..c9842f82 100644
--- a/d1-template/package.json
+++ b/d1-template/package.json
@@ -1,5 +1,21 @@
 {
   "name": "d1-template",
+  "description": "Cloudflare's native serverless SQL database.",
+  "cloudflare": {
+    "label": "Worker + D1 Database",
+    "products": [
+      "Workers",
+      "D1"
+    ],
+    "categories": [
+      "storage"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/c6fc5da3-1e0a-4608-b2f1-9628577ec800/public",
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ],
+    "docs_url": "https://developers.cloudflare.com/d1/"
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/image-classification-template/package.json b/image-classification-template/package.json
index d395d9d8..df012a9c 100644
--- a/image-classification-template/package.json
+++ b/image-classification-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "image-classification-template",
+  "description": "Identify and label objects found in images.",
+  "cloudflare": {
+    "label": "Image Classification App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/llm-template/package.json b/llm-template/package.json
index 4480d2ab..97cdabd0 100644
--- a/llm-template/package.json
+++ b/llm-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "llm-template",
+  "description": "Perform natural language processing tasks using a Large Language Model (LLM) with Workers.",
+  "cloudflare": {
+    "label": "LLM App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/package.json b/package.json
index 4ffd44e0..941dd25a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "check:ci": "prettier . --check && syncpack lint && turbo run check types && git diff --exit-code",
     "deploy": "turbo run deploy",
-    "fix:ci": "prettier . --write && syncpack fix-mismatches && turbo run types"
+    "fix:ci": "prettier . --write && syncpack format && syncpack fix-mismatches && turbo run types"
   },
   "workspaces": [
     "./*-template"
diff --git a/speech-to-text-template/package.json b/speech-to-text-template/package.json
index 1e577a6f..da8cd02a 100644
--- a/speech-to-text-template/package.json
+++ b/speech-to-text-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "speech-to-text-template",
+  "description": "Convert audio to text with Whisper.",
+  "cloudflare": {
+    "label": "Speech to Text App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/text-classification-template/package.json b/text-classification-template/package.json
index f0d3ac9d..1c589072 100644
--- a/text-classification-template/package.json
+++ b/text-classification-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "text-classification-template",
+  "description": "Categorize unstructured text into groups based on criteria of your choice.",
+  "cloudflare": {
+    "label": "Text Classification App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/text-to-image-template/package.json b/text-to-image-template/package.json
index 362092a8..5fb44004 100644
--- a/text-to-image-template/package.json
+++ b/text-to-image-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "text-to-image-template",
+  "description": "Generate images based on text prompts.",
+  "cloudflare": {
+    "label": "Text to Image App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/translation-template/package.json b/translation-template/package.json
index 20f83835..8c70fc20 100644
--- a/translation-template/package.json
+++ b/translation-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "translation-template",
+  "description": "Translate text from one language to another.",
+  "cloudflare": {
+    "label": "Translation App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",
diff --git a/vector-embedding-template/package.json b/vector-embedding-template/package.json
index 3a597000..98181af7 100644
--- a/vector-embedding-template/package.json
+++ b/vector-embedding-template/package.json
@@ -1,5 +1,19 @@
 {
   "name": "vector-embedding-template",
+  "description": "Convert text into mathematical vectors so that you can perform text analysis and transformations.",
+  "cloudflare": {
+    "label": "Vector Embedding App",
+    "products": [
+      "Workers",
+      "AI"
+    ],
+    "categories": [
+      "ai"
+    ],
+    "icon_urls": [
+      "https://imagedelivery.net/wSMYJvS3Xw-n339CbDyDIA/5ca0ca32-e897-4699-d4c1-6b680512f000/public"
+    ]
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20241112.0",
     "typescript": "5.6.3",