diff --git a/public/images/cre-templates/templates/circuit-breaker.png b/public/images/cre-templates/templates/circuit-breaker.png
new file mode 100644
index 00000000000..d52ca9e8582
Binary files /dev/null and b/public/images/cre-templates/templates/circuit-breaker.png differ
diff --git a/public/images/cre-templates/templates/event-reactor.png b/public/images/cre-templates/templates/event-reactor.png
new file mode 100644
index 00000000000..5fe15e8350f
Binary files /dev/null and b/public/images/cre-templates/templates/event-reactor.png differ
diff --git a/public/images/cre-templates/templates/keeper-bot.png b/public/images/cre-templates/templates/keeper-bot.png
new file mode 100644
index 00000000000..10ac857371d
Binary files /dev/null and b/public/images/cre-templates/templates/keeper-bot.png differ
diff --git a/public/images/cre-templates/templates/prediction-market-creation.png b/public/images/cre-templates/templates/prediction-market-creation.png
new file mode 100644
index 00000000000..c61013cccd2
Binary files /dev/null and b/public/images/cre-templates/templates/prediction-market-creation.png differ
diff --git a/public/images/cre-templates/templates/prediction-market-dispute.png b/public/images/cre-templates/templates/prediction-market-dispute.png
new file mode 100644
index 00000000000..4c2ea738ed1
Binary files /dev/null and b/public/images/cre-templates/templates/prediction-market-dispute.png differ
diff --git a/public/images/cre-templates/templates/prediction-market-resolution.png b/public/images/cre-templates/templates/prediction-market-resolution.png
new file mode 100644
index 00000000000..62c29c8ea84
Binary files /dev/null and b/public/images/cre-templates/templates/prediction-market-resolution.png differ
diff --git a/public/images/cre-templates/templates/stablecoin-flow1.png b/public/images/cre-templates/templates/stablecoin-flow1.png
new file mode 100644
index 00000000000..8b6c8a4d156
Binary files /dev/null and b/public/images/cre-templates/templates/stablecoin-flow1.png differ
diff --git a/public/images/cre-templates/templates/stablecoin-flow2.png b/public/images/cre-templates/templates/stablecoin-flow2.png
new file mode 100644
index 00000000000..7403d0e23e5
Binary files /dev/null and b/public/images/cre-templates/templates/stablecoin-flow2.png differ
diff --git a/public/images/cre-templates/templates/tokenized-asset-flow.png b/public/images/cre-templates/templates/tokenized-asset-flow.png
new file mode 100644
index 00000000000..10371e394d2
Binary files /dev/null and b/public/images/cre-templates/templates/tokenized-asset-flow.png differ
diff --git a/public/images/cre-templates/templates/vault-harvester.png b/public/images/cre-templates/templates/vault-harvester.png
new file mode 100644
index 00000000000..71329720fdf
Binary files /dev/null and b/public/images/cre-templates/templates/vault-harvester.png differ
diff --git a/src/components/CRETemplate/CRETemplateOverview.astro b/src/components/CRETemplate/CRETemplateOverview.astro
index e8c509ba151..cd4f5a7db78 100644
--- a/src/components/CRETemplate/CRETemplateOverview.astro
+++ b/src/components/CRETemplate/CRETemplateOverview.astro
@@ -3,9 +3,8 @@ import { CRETemplatesFrontmatter } from "~/content.config.ts"
 
 interface Props {
   frontmatter: CRETemplatesFrontmatter
-  templateSlug: string
 }
-const { frontmatter, templateSlug } = Astro.props
+const { frontmatter } = Astro.props
 ---
 
 <div class="hero-content">
@@ -28,38 +27,78 @@ const { frontmatter, templateSlug } = Astro.props
     <!-- Description -->
     <p class="description">{frontmatter.description}</p>
 
-    <!-- Get the template section (hidden until CLI is available) -->
-    <div class="get-template" style="display: none;">
-      <span class="get-template-label">Get the template</span>
-      <div class="template-actions">
-        <div class="command-box">
-          <code style="color: #fff !important;">cre init --template={templateSlug}</code>
-          <button class="copy-btn" data-command={`cre init --template=${templateSlug}`} title="Copy command">
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-              <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
-              <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+    {
+      frontmatter.cliTemplateIds?.length ? (
+        <div class="get-template">
+          <span class="get-template-label">Get the template</span>
+          <div class="template-actions">
+            {frontmatter.cliTemplateIds.length > 1 && (
+              <div class="lang-toggle">
+                {frontmatter.cliTemplateIds.map((entry, i) => (
+                  <button class={`lang-toggle-pill ${i === 0 ? "active" : ""}`} data-cli-id={entry.id}>
+                    {entry.label.replace("TypeScript", "TS")}
+                  </button>
+                ))}
+              </div>
+            )}
+            <div class="command-box">
+              <code id="cli-command" style="color: #fff !important;">
+                cre init --template={frontmatter.cliTemplateIds[0].id}
+              </code>
+              <button
+                class="copy-btn"
+                id="cli-copy-btn"
+                data-command={`cre init --template=${frontmatter.cliTemplateIds[0].id}`}
+                title="Copy command"
+              >
+                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                  <rect x="9" y="9" width="13" height="13" rx="2" ry="2" />
+                  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" />
+                </svg>
+              </button>
+            </div>
+            <a href={frontmatter.githubUrl} class="github-btn" target="_blank" rel="noopener noreferrer">
+              <svg class="github-icon" width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                <path d="M12 0C5.374 0 0 5.373 0 12c0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23A11.509 11.509 0 0112 5.803c1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576C20.566 21.797 24 17.3 24 12c0-6.627-5.373-12-12-12z" />
+              </svg>
+              View on GitHub
+            </a>
+          </div>
+        </div>
+      ) : (
+        <div class="github-buttons">
+          <a href={frontmatter.githubUrl} class="github-btn" target="_blank" rel="noopener noreferrer">
+            <svg class="github-icon" width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+              <path d="M12 0C5.374 0 0 5.373 0 12c0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23A11.509 11.509 0 0112 5.803c1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576C20.566 21.797 24 17.3 24 12c0-6.627-5.373-12-12-12z" />
             </svg>
-          </button>
+            View on GitHub
+          </a>
         </div>
-      </div>
-    </div>
-
-    <!-- GitHub button -->
-    <div class="github-buttons">
-      <a href={frontmatter.githubUrl} class="github-btn" target="_blank" rel="noopener noreferrer">
-        <svg class="github-icon" width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
-          <path
-            d="M12 0C5.374 0 0 5.373 0 12c0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23A11.509 11.509 0 0112 5.803c1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576C20.566 21.797 24 17.3 24 12c0-6.627-5.373-12-12-12z"
-          ></path>
-        </svg>
-        View on GitHub
-      </a>
-    </div>
+      )
+    }
   </div>
 </div>
 
 <script>
   document.addEventListener("DOMContentLoaded", () => {
+    const cliCommand = document.getElementById("cli-command")
+    const cliCopyBtn = document.getElementById("cli-copy-btn") as HTMLButtonElement | null
+    const togglePills = document.querySelectorAll<HTMLButtonElement>(".lang-toggle-pill")
+
+    togglePills.forEach((pill) => {
+      pill.addEventListener("click", () => {
+        const id = pill.dataset.cliId
+        if (!id || !cliCommand || !cliCopyBtn) return
+
+        togglePills.forEach((p) => p.classList.remove("active"))
+        pill.classList.add("active")
+
+        const command = `cre init --template=${id}`
+        cliCommand.textContent = command
+        cliCopyBtn.dataset.command = command
+      })
+    })
+
     const copyBtns = document.querySelectorAll<HTMLButtonElement>(".copy-btn")
     copyBtns.forEach((btn) => {
       btn.addEventListener("click", async () => {
@@ -121,7 +160,6 @@ const { frontmatter, templateSlug } = Astro.props
     max-width: 500px;
   }
 
-  /* Hidden until CLI is available — remove style="display: none;" from .get-template to re-enable */
   .get-template {
     display: flex;
     flex-direction: column;
@@ -134,10 +172,44 @@ const { frontmatter, templateSlug } = Astro.props
     color: #5a6175;
   }
 
+  .lang-toggle {
+    display: inline-flex;
+    border-radius: 6px;
+    border: 1px solid #d1d5db;
+    flex-shrink: 0;
+  }
+
+  .lang-toggle-pill {
+    display: flex;
+    align-items: center;
+    padding: 0 14px;
+    background: #f5f7fa;
+    color: #5a6175;
+    font-size: 13px;
+    font-weight: 600;
+    border: none;
+    cursor: pointer;
+    transition: all 0.15s ease;
+    white-space: nowrap;
+  }
+
+  .lang-toggle-pill:not(:last-child) {
+    border-right: 1px solid #d1d5db;
+  }
+
+  .lang-toggle-pill:hover {
+    background: #e8eaed;
+  }
+
+  .lang-toggle-pill.active {
+    background: #1e293b;
+    color: white;
+  }
+
   .template-actions {
     display: flex;
     flex-wrap: wrap;
-    align-items: center;
+    align-items: stretch;
     gap: var(--space-3x);
   }
 
@@ -149,6 +221,24 @@ const { frontmatter, templateSlug } = Astro.props
     background: #1e293b;
     border-radius: 6px;
     font-family: var(--font-mono, monospace);
+    white-space: nowrap;
+    overflow-x: auto;
+    min-width: 0;
+  }
+
+  @media (max-width: 50em) {
+    .template-actions {
+      flex-direction: column;
+      align-items: flex-start;
+    }
+
+    .command-box {
+      max-width: 100%;
+    }
+
+    .lang-toggle-pill {
+      padding: 10px 18px;
+    }
   }
 
   .command-box code,
@@ -201,10 +291,11 @@ const { frontmatter, templateSlug } = Astro.props
     font-size: 14px;
     font-weight: 600;
     border: 1px solid #0847f7;
-    border-radius: 4px;
+    border-radius: 6px;
     text-decoration: none;
     transition: all 0.2s ease;
-    min-width: 120px;
+    white-space: nowrap;
+    flex-shrink: 0;
   }
 
   .github-btn:hover {
diff --git a/src/components/CRETemplate/TemplateCard.astro b/src/components/CRETemplate/TemplateCard.astro
index cc100b567a7..4f7e4887030 100644
--- a/src/components/CRETemplate/TemplateCard.astro
+++ b/src/components/CRETemplate/TemplateCard.astro
@@ -6,11 +6,12 @@ interface Props {
   href: string
   author: string
   languages: string[] // e.g., ["Go", "TypeScript", "Go (MVR)"]
+  tags?: string[] // e.g., ["data-feeds", "cross-chain", "defi"]
 }
 
-const { title, description, href, author, languages } = Astro.props
+const { title, description, href, author, languages, tags = [] } = Astro.props
 
-// Extract unique base languages (e.g., "Go (MVR)" -> "Go")
+// Extract unique base languages (e.g., "Go (MVR)" -> "Go") — used for filtering
 const baseLanguages = [...new Set(languages.map((lang) => lang.replace(/\s*\([^)]*\)\s*/g, "").trim()))].sort(
   (a, b) => {
     // TypeScript always comes first
@@ -19,6 +20,9 @@ const baseLanguages = [...new Set(languages.map((lang) => lang.replace(/\s*\([^)
     return a.localeCompare(b)
   }
 )
+
+// Show at most 3 tags on the card
+const displayTags = tags.slice(0, 3)
 ---
 
 <a href={href} class="template-card" data-languages={baseLanguages.join(",")}>
@@ -27,9 +31,9 @@ const baseLanguages = [...new Set(languages.map((lang) => lang.replace(/\s*\([^)
 
   <!-- Card Content -->
   <div class="card-content">
-    <!-- Badges -->
+    <!-- Tags -->
     <div class="language-badges">
-      {baseLanguages.map((lang) => <span class="lang-badge">{lang}</span>)}
+      {displayTags.map((tag) => <span class="lang-badge">{tag}</span>)}
     </div>
 
     <!-- Title -->
@@ -120,6 +124,8 @@ const baseLanguages = [...new Set(languages.map((lang) => lang.replace(/\s*\([^)
   /* Language Badges */
   .language-badges {
     display: flex;
+    flex-wrap: wrap;
+    align-items: center;
     gap: 8px;
     margin-bottom: 16px;
   }
@@ -134,6 +140,7 @@ const baseLanguages = [...new Set(languages.map((lang) => lang.replace(/\s*\([^)
     border: 1px solid #e5e7eb;
     letter-spacing: 0.3px;
     text-transform: uppercase;
+    text-align: center;
   }
 
   /* Title */
diff --git a/src/content.config.ts b/src/content.config.ts
index 3120ab1d897..1efd9e49909 100644
--- a/src/content.config.ts
+++ b/src/content.config.ts
@@ -102,6 +102,15 @@ const creTemplatesFrontmatter = z
     ), // Links to GitHub folders for each language variant
     image: z.string(),
     featured: z.boolean().optional(), // Whether this template is featured on the hub page
+    tags: z.array(z.string()).optional(), // Tags from cre-templates registry (e.g., "data-feeds", "cross-chain")
+    cliTemplateIds: z
+      .array(
+        z.object({
+          label: z.string(), // e.g., "TypeScript", "Go"
+          id: z.string(), // CLI ID used in `cre init --template=<id>`
+        })
+      )
+      .optional(),
     datePublished: z.string().optional(), // ISO date string
     lastModified: z.string().optional(), // ISO date string
   })
diff --git a/src/content/cre-templates/aws-cre-pricefeeds-por.mdx b/src/content/cre-templates/aws-cre-pricefeeds-por.mdx
index c6ac17c3007..6ff4d5cf8ce 100644
--- a/src/content/cre-templates/aws-cre-pricefeeds-por.mdx
+++ b/src/content/cre-templates/aws-cre-pricefeeds-por.mdx
@@ -4,6 +4,10 @@ description: "Workflows using Chainlink CRE to fetch data from AWS serverless AP
 excerpt: "Combine AWS reliability with decentralized trust guarantees for digital asset price feeds and proof-of-reserves monitoring."
 author: "AWS"
 image: "thumbnail.jpg"
+tags:
+  - "data-feeds"
+  - "proof-of-reserve"
+  - "aws"
 githubUrl: "https://github.com/aws-samples/sample-cre-pricefeeds-por"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/bring-your-own-data.mdx b/src/content/cre-templates/bring-your-own-data.mdx
index 0dab6a76e5b..ab8f2cca7a2 100644
--- a/src/content/cre-templates/bring-your-own-data.mdx
+++ b/src/content/cre-templates/bring-your-own-data.mdx
@@ -4,6 +4,15 @@ description: "A template for bringing your own off-chain Proof-of-Reserve (PoR)
 author: "Chainlink Labs"
 excerpt: "Publish verified financial or reserve data to smart contracts using CRE."
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "bring-your-own-data-ts"
+  - label: "Go"
+    id: "bring-your-own-data-go"
+tags:
+  - "data-feeds"
+  - "custom-data"
+  - "proof-of-reserve"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/bring-your-own-data"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/circuit-breaker.mdx b/src/content/cre-templates/circuit-breaker.mdx
new file mode 100644
index 00000000000..ade2c3c17dc
--- /dev/null
+++ b/src/content/cre-templates/circuit-breaker.mdx
@@ -0,0 +1,109 @@
+---
+title: "Circuit Breaker"
+description: "Monitor on-chain events for anomalies, automatically pause contracts when thresholds are breached using a dual-trigger circuit breaker pattern."
+author: "Chainlink Labs"
+excerpt: "Protect DeFi protocols with automated anomaly detection and circuit breaking using CRE."
+image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "circuit-breaker-ts"
+tags:
+  - "circuit-breaker"
+  - "risk-management"
+  - "safety"
+githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/circuit-breaker"
+githubRepoLinks:
+  - label: "TypeScript"
+    url: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/circuit-breaker/circuit-breaker-ts"
+datePublished: "2026-03-19"
+lastModified: "2026-03-19"
+---
+
+import { Aside, Accordion, ClickToZoom } from "@components"
+
+## What This Template Does
+
+This template demonstrates a **dual-trigger circuit breaker pattern** that monitors on-chain events for anomalies and automatically pauses contracts when thresholds are breached.
+
+Two triggers work together:
+
+- **LogTrigger** — Fires when `ProtocolWithBreaker` emits a `PriceUpdated` event. The workflow decodes the event data (newPrice, oldPrice, timestamp), reads on-chain state, calculates price deviation in basis points, and trips the breaker if deviation exceeds the threshold.
+- **Cron** — Fires every 10 minutes for periodic health checks. Reads protocol state and logs current status for monitoring.
+
+Both triggers converge on decision logic: if an anomaly is detected, a DON-signed report is sent via `KeystoneForwarder` to pause the protocol on-chain.
+
+**Key Technologies:**
+
+- **CRE (Chainlink Runtime Environment)** — Orchestrates dual-trigger workflows with DON consensus
+- **LogTrigger + Cron** — Real-time event monitoring with async health checks
+- **On-chain circuit breaker** — One-way pause by default (only CRE can unpause)
+
+---
+
+## How It Works
+
+<ClickToZoom src="/images/cre-templates/templates/circuit-breaker.png" alt="Circuit Breaker workflow diagram" />
+
+---
+
+## Getting Started
+
+<Accordion title="Install dependencies" number={1}>
+
+```bash
+cd my-workflow && bun install && cd .. && cd contracts && bun install && cd ..
+```
+
+</Accordion>
+
+<Accordion title="Run tests" number={2}>
+
+```bash
+cd my-workflow && bun test
+```
+
+</Accordion>
+
+<Accordion title="Simulate the workflow" number={3}>
+
+Simulate the **Cron health check**:
+
+```bash
+cre workflow simulate my-workflow --target staging-settings
+```
+
+Simulate the **LogTrigger** with an anomalous price event:
+
+```bash
+cre workflow simulate my-workflow --target staging-settings \
+  --non-interactive \
+  --trigger-index 0 \
+  --evm-tx-hash 0x98dfb56db57cb0689e5e4092949d41431a283f52128066bc941b0c219d3f6203 \
+  --evm-event-index 0
+```
+
+</Accordion>
+
+<Accordion title="Deploy your own contract" number={4}>
+
+Deploy `ProtocolWithBreaker` with constructor arguments: forwarder address, initial price, and deviation threshold in basis points (1000 = 10%):
+
+```bash
+forge create src/ProtocolWithBreaker.sol:ProtocolWithBreaker \
+  --broadcast \
+  --private-key <KEY> \
+  --rpc-url <RPC> \
+  --constructor-args 0x15fc6ae953e024d975e77382eeec56a9101f9f88 1000000000000000000 1000
+```
+
+</Accordion>
+
+## Customization
+
+- **Change threshold** — Update `_deviationThresholdBps` in the constructor args
+- **Change schedule** — Edit `schedule` in `config.staging.json`
+- **Add webhook alerts** — Use `HTTPClient` POST to send notifications when the breaker trips
+- **Monitor different events** — Change the event listener to watch different contract events
+- **Implement unpause logic** — Create a separate workflow to unpause the protocol
+
+For full details, see the [TypeScript README](https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/circuit-breaker/circuit-breaker-ts) on GitHub.
diff --git a/src/content/cre-templates/custom-data-feed.mdx b/src/content/cre-templates/custom-data-feed.mdx
index 4deda620a0e..5b738f59d6a 100644
--- a/src/content/cre-templates/custom-data-feed.mdx
+++ b/src/content/cre-templates/custom-data-feed.mdx
@@ -4,6 +4,14 @@ description: "A template for bringing your own custom off-chain data feed on-cha
 author: "Chainlink Labs"
 excerpt: "Build data feeds that combine offchain APIs with onchain smart contracts."
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "cre-custom-data-feed-ts"
+  - label: "Go"
+    id: "cre-custom-data-feed-go"
+tags:
+  - "data-feeds"
+  - "custom-data"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/custom-data-feed"
 githubRepoLinks:
   - label: "TypeScript"
diff --git a/src/content/cre-templates/event-reactor.mdx b/src/content/cre-templates/event-reactor.mdx
new file mode 100644
index 00000000000..c5452efe6ea
--- /dev/null
+++ b/src/content/cre-templates/event-reactor.mdx
@@ -0,0 +1,114 @@
+---
+title: "Event Reactor"
+description: "Listen for on-chain events, fetch off-chain context, and respond on-chain using the event → read → decide → write pattern."
+author: "Chainlink Labs"
+excerpt: "React to on-chain events in real time with automated state-aware decision making using CRE."
+image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "event-reactor-ts"
+tags:
+  - "event-driven"
+  - "compliance"
+githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/event-reactor"
+githubRepoLinks:
+  - label: "TypeScript"
+    url: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/event-reactor/event-reactor-ts"
+datePublished: "2026-03-19"
+lastModified: "2026-03-19"
+---
+
+import { Aside, Accordion, ClickToZoom } from "@components"
+
+## What This Template Does
+
+This template demonstrates the **event → read → decide → write** pattern using a LogTrigger for real-time on-chain reaction.
+
+The workflow:
+
+1. **LogTrigger** fires when `MonitoredToken` emits a `LargeTransfer` event
+2. **Decodes** the event using typed bindings (from, to, amount, timestamp)
+3. **Reads** `ReactorConsumer` state to check if the sender is already flagged
+4. **Decides**: If not flagged, sends a signed report to flag the address on-chain. If already flagged, logs and skips.
+
+**Key Technologies:**
+
+- **CRE (Chainlink Runtime Environment)** — Event-driven workflow orchestration with DON consensus
+- **LogTrigger** — Real-time event reaction without cron delays
+- **State-aware decisions** — Checks existing state before acting to avoid duplicates
+
+---
+
+## How It Works
+
+<ClickToZoom src="/images/cre-templates/templates/event-reactor.png" alt="Event Reactor workflow diagram" />
+
+---
+
+## Getting Started
+
+<Accordion title="Install dependencies" number={1}>
+
+```bash
+cd my-workflow && bun install && cd .. && cd contracts && bun install && cd ..
+```
+
+</Accordion>
+
+<Accordion title="Run tests" number={2}>
+
+```bash
+cd my-workflow && bun test
+```
+
+</Accordion>
+
+<Accordion title="Simulate the workflow" number={3}>
+
+Simulate with a pre-emitted event on Sepolia:
+
+```bash
+cre workflow simulate my-workflow --target staging-settings \
+  --non-interactive \
+  --trigger-index 0 \
+  --evm-tx-hash 0xe5ac97df3f93c5fdc89690a71d68a8e5ebd35ec8ba9c6cb5d1069f5818222553 \
+  --evm-event-index 0
+```
+
+Emit your own `LargeTransfer` event:
+
+```bash
+cast send 0x805A04e5C8b2dcb2B26C9e9C9aa12ce34374A35b \
+  "simulateLargeTransfer(address,uint256)" \
+  0x000000000000000000000000000000000000dEaD \
+  2000000000000000000000
+```
+
+</Accordion>
+
+<Accordion title="Deploy your own contracts" number={4}>
+
+Deploy `MonitoredToken` (no constructor args):
+
+```bash
+forge create src/MonitoredToken.sol:MonitoredToken \
+  --broadcast --private-key <KEY> --rpc-url <RPC>
+```
+
+Deploy `ReactorConsumer` with the forwarder address:
+
+```bash
+forge create src/ReactorConsumer.sol:ReactorConsumer \
+  --broadcast --private-key <KEY> --rpc-url <RPC> \
+  --constructor-args 0x15fc6ae953e024d975e77382eeec56a9101f9f88
+```
+
+</Accordion>
+
+## Customization
+
+- **Change monitored event** — Modify `MonitoredToken` or point to a different contract
+- **Change reaction logic** — Update the `onLargeTransfer` workflow and `_processReport` in the contract
+- **Add off-chain API calls** — Use `cre.capabilities.HTTPClient` to fetch external data before deciding
+
+For full details, see the [TypeScript README](https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/event-reactor/event-reactor-ts) on GitHub.
diff --git a/src/content/cre-templates/indexer-block-trigger.mdx b/src/content/cre-templates/indexer-block-trigger.mdx
index 1e381148b99..9f8d1100842 100644
--- a/src/content/cre-templates/indexer-block-trigger.mdx
+++ b/src/content/cre-templates/indexer-block-trigger.mdx
@@ -4,6 +4,15 @@ description: "Workflows for processing new blocks and transactions using block-t
 excerpt: "Learn how to react to block events via HTTP webhook triggers and match transactions to watched addresses."
 author: "Chainlink Labs"
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "block-trigger-ts"
+  - label: "Go"
+    id: "block-trigger-go"
+tags:
+  - "indexer"
+  - "webhook"
+  - "event-monitoring"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/building-blocks/indexer-block-trigger"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/indexer-data-fetch.mdx b/src/content/cre-templates/indexer-data-fetch.mdx
index 01148ab01a2..67abd285b77 100644
--- a/src/content/cre-templates/indexer-data-fetch.mdx
+++ b/src/content/cre-templates/indexer-data-fetch.mdx
@@ -4,6 +4,14 @@ description: "Workflows for pulling data from The Graph indexer with scheduled c
 excerpt: "Learn how to query The Graph indexer using GraphQL with scheduled cron triggers."
 author: "Chainlink Labs"
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "indexer-fetch-ts"
+  - label: "Go"
+    id: "indexer-fetch-go"
+tags:
+  - "indexer"
+  - "data-fetch"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/building-blocks/indexer-data-fetch"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/keeper-bot.mdx b/src/content/cre-templates/keeper-bot.mdx
new file mode 100644
index 00000000000..18299c486f8
--- /dev/null
+++ b/src/content/cre-templates/keeper-bot.mdx
@@ -0,0 +1,105 @@
+---
+title: "Keeper Bot"
+description: "Cron-based smart contract maintenance — read state, check condition, execute if needed using the universal keeper pattern."
+author: "Chainlink Labs"
+excerpt: "Automate periodic smart contract upkeep with off-chain condition checking and on-chain execution."
+image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "keeper-bot-ts"
+tags:
+  - "keeper"
+  - "upkeep"
+  - "automation"
+githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/keeper-bot"
+githubRepoLinks:
+  - label: "TypeScript"
+    url: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/keeper-bot/keeper-bot-ts"
+datePublished: "2026-03-19"
+lastModified: "2026-03-19"
+---
+
+import { Aside, Accordion, ClickToZoom } from "@components"
+
+## What This Template Does
+
+This template implements the universal **cron → read → check → write** pattern for periodic smart contract maintenance.
+
+The workflow:
+
+1. **Cron trigger** fires every 5 minutes (configurable)
+2. **Reads** `needsUpkeep()` from the on-chain `KeeperConsumer` contract
+3. **If upkeep needed**: Encodes a new counter value, generates a DON-signed report, and writes on-chain via `KeystoneForwarder`
+4. **If not needed**: Logs and skips — no wasted gas
+
+This pattern is a direct replacement for Gelato Web3Functions and Chainlink Automation.
+
+**Key Technologies:**
+
+- **CRE (Chainlink Runtime Environment)** — Orchestrates periodic workflows with DON consensus
+- **Off-chain condition checking** — No gas wasted on failed checks
+- **Configurable scheduling** — Standard cron expressions
+
+---
+
+## How It Works
+
+<ClickToZoom src="/images/cre-templates/templates/keeper-bot.png" alt="Keeper Bot workflow diagram" />
+
+---
+
+## Getting Started
+
+<Accordion title="Install dependencies" number={1}>
+
+```bash
+cd my-workflow && bun install && cd ..
+```
+
+</Accordion>
+
+<Accordion title="Run tests" number={2}>
+
+```bash
+cd my-workflow && bun test
+```
+
+</Accordion>
+
+<Accordion title="Simulate the workflow" number={3}>
+
+Dry run:
+
+```bash
+cre workflow simulate my-workflow --target staging-settings
+```
+
+With broadcast (writes on-chain):
+
+```bash
+cre workflow simulate my-workflow --target staging-settings --broadcast
+```
+
+</Accordion>
+
+<Accordion title="Deploy your own contract" number={4}>
+
+Deploy `KeeperConsumer` with constructor arguments: forwarder address and interval in seconds (e.g., 300 for 5 minutes):
+
+```bash
+forge create src/KeeperConsumer.sol:KeeperConsumer \
+  --broadcast --private-key <KEY> --rpc-url <RPC> \
+  --constructor-args 0x15fc6ae953e024d975e77382eeec56a9101f9f88 300
+```
+
+Then update `contractAddress` in `my-workflow/config.staging.json`.
+
+</Accordion>
+
+## Customization
+
+- **Change schedule** — Edit `schedule` in `config.staging.json` (cron syntax)
+- **Change condition** — Replace `needsUpkeep()` with any view function
+- **Change action** — Modify `_processReport()` logic in the contract
+
+For full details, see the [TypeScript README](https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/keeper-bot/keeper-bot-ts) on GitHub.
diff --git a/src/content/cre-templates/kv-store.mdx b/src/content/cre-templates/kv-store.mdx
index e41731ecd8a..cd81c8351b3 100644
--- a/src/content/cre-templates/kv-store.mdx
+++ b/src/content/cre-templates/kv-store.mdx
@@ -4,6 +4,14 @@ description: "A minimal example that reads a value from an AWS S3 object, increm
 excerpt: "Learn offchain write patterns with secrets and consensus using AWS S3 as a key-value store."
 author: "Chainlink Labs"
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "kv-store-ts"
+  - label: "Go"
+    id: "kv-store-go"
+tags:
+  - "storage"
+  - "key-value"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/building-blocks/kv-store"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/multi-chain-token-manager.mdx b/src/content/cre-templates/multi-chain-token-manager.mdx
index 6f5ca611e13..95e2cf66704 100644
--- a/src/content/cre-templates/multi-chain-token-manager.mdx
+++ b/src/content/cre-templates/multi-chain-token-manager.mdx
@@ -4,6 +4,15 @@ description: "A multi-chain token manager that maximizes lending yields via auto
 author: "Chainlink Labs"
 excerpt: "Manage token operations across different EVM chains with cross-chain coordination patterns."
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "multi-chain-token-manager-ts"
+  - label: "Go"
+    id: "multi-chain-token-manager-go"
+tags:
+  - "cross-chain"
+  - "defi"
+  - "token-management"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/multi-chain-token-manager"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/prediction-market-demo.mdx b/src/content/cre-templates/prediction-market-demo.mdx
index 9914f0d857b..46a5f3ebb93 100644
--- a/src/content/cre-templates/prediction-market-demo.mdx
+++ b/src/content/cre-templates/prediction-market-demo.mdx
@@ -5,6 +5,9 @@ excerpt: "Build a fully automated prediction market system with CRE, Gemini AI,
 author: "Chainlink Labs"
 image: "thumbnail.jpg"
 featured: true
+tags:
+  - "prediction-market"
+  - "ai"
 githubUrl: "https://github.com/smartcontractkit/cre-gcp-prediction-market-demo"
 githubRepoLinks:
   - label: "TypeScript"
diff --git a/src/content/cre-templates/prediction-market.mdx b/src/content/cre-templates/prediction-market.mdx
new file mode 100644
index 00000000000..92d30f43cf6
--- /dev/null
+++ b/src/content/cre-templates/prediction-market.mdx
@@ -0,0 +1,168 @@
+---
+title: "Prediction Market (Data Feeds)"
+description: "Full prediction market lifecycle with market creation, resolution using Chainlink Data Feeds, and dispute management."
+author: "Chainlink Labs"
+excerpt: "Build a complete prediction market backend with deterministic on-chain resolution using Chainlink BTC/USD Data Feeds."
+image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "prediction-market-ts"
+tags:
+  - "data-feeds"
+  - "prediction-market"
+  - "defi"
+githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/prediction-market"
+githubRepoLinks:
+  - label: "TypeScript"
+    url: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/prediction-market/prediction-market-ts"
+datePublished: "2026-03-19"
+lastModified: "2026-03-19"
+---
+
+import { Aside, Accordion, ClickToZoom } from "@components"
+
+{/* prettier-ignore */}
+<Aside type="note">
+This template uses **Chainlink Data Feeds** (BTC/USD) for deterministic on-chain resolution. For an AI-powered prediction market using Gemini AI, see the [Prediction Market Demo](/cre-templates/prediction-market-demo).
+</Aside>
+
+## What This Template Does
+
+This template implements the **full prediction market lifecycle** using three CRE workflows that share a single `PredictionMarket` smart contract:
+
+1. **Market Creation** (Cron, hourly) — Creates new binary prediction markets with configurable strike prices and expiration times
+2. **Market Resolution** (Cron, every 10 minutes) — Checks expired markets and resolves them using the Chainlink BTC/USD Data Feed
+3. **Dispute Management** (LogTrigger) — Listens for `DisputeRaised` events and re-evaluates outcomes with fresh price data
+
+**Key Technologies:**
+
+- **CRE (Chainlink Runtime Environment)** — Multi-workflow orchestration with DON consensus
+- **Chainlink Data Feeds** — Deterministic BTC/USD price resolution
+- **LogTrigger + Cron** — Event-driven disputes with periodic creation and resolution
+
+---
+
+## How It Works
+
+### Market Creation
+
+<ClickToZoom
+  src="/images/cre-templates/templates/prediction-market-creation.png"
+  alt="Market Creation workflow diagram"
+/>
+
+### Market Resolution
+
+<ClickToZoom
+  src="/images/cre-templates/templates/prediction-market-resolution.png"
+  alt="Market Resolution workflow diagram"
+/>
+
+### Dispute Management
+
+<ClickToZoom
+  src="/images/cre-templates/templates/prediction-market-dispute.png"
+  alt="Dispute Management workflow diagram"
+/>
+
+---
+
+## Project Structure
+
+```
+prediction-market-ts/
+├── contracts/          # Shared contracts and bindings
+├── market-creation/    # Workflow 1: Create markets
+├── market-resolution/  # Workflow 2: Resolve expired markets
+└── market-dispute/     # Workflow 3: Handle disputes
+```
+
+---
+
+## Getting Started
+
+<Accordion title="Install dependencies" number={1}>
+
+```bash
+cd contracts && bun install && cd ..
+cd market-creation && bun install && cd ..
+cd market-resolution && bun install && cd ..
+cd market-dispute && bun install && cd ..
+```
+
+</Accordion>
+
+<Accordion title="Run tests" number={2}>
+
+```bash
+cd market-creation && bun test && cd ..
+cd market-resolution && bun test && cd ..
+cd market-dispute && bun test && cd ..
+```
+
+</Accordion>
+
+<Accordion title="Simulate workflows" number={3}>
+
+**Market Creation:**
+
+```bash
+cre workflow simulate market-creation --target staging-settings
+```
+
+**Market Resolution:**
+
+```bash
+cre workflow simulate market-resolution --target staging-settings
+```
+
+**Dispute Management** (requires a transaction that emitted `DisputeRaised`):
+
+```bash
+cre workflow simulate market-dispute --target staging-settings \
+  --non-interactive \
+  --trigger-index 0 \
+  --evm-tx-hash <TX_THAT_EMITTED_DISPUTE_RAISED> \
+  --evm-event-index 0
+```
+
+Broadcast any workflow to write on-chain:
+
+```bash
+cre workflow simulate market-creation --target staging-settings --broadcast
+```
+
+</Accordion>
+
+<Accordion title="Deploy your own contract" number={4}>
+
+A demo contract is pre-deployed on Sepolia at `0xEb792aF46AB2c2f1389A774AB806423DB43aA425`.
+
+To deploy your own with Foundry:
+
+```bash
+forge create src/PredictionMarket.sol:PredictionMarket \
+  --broadcast --private-key $PRIVATE_KEY \
+  --rpc-url https://ethereum-sepolia-rpc.publicnode.com \
+  --constructor-args \
+    0x15fc6ae953e024d975e77382eeec56a9101f9f88 \
+    0x1b44F3514812d835EB1BDB0acB33d3fA3351Ee43 \
+    86400
+```
+
+Constructor arguments:
+
+- **Forwarder**: `0x15fc6ae953e024d975e77382eeec56a9101f9f88`
+- **Price Feed**: `0x1b44F3514812d835EB1BDB0acB33d3fA3351Ee43` (BTC/USD on Sepolia)
+- **Dispute Window**: `86400` (24 hours in seconds)
+
+</Accordion>
+
+## Customization
+
+- **Use a different asset** — Deploy with a different `priceFeed` address (e.g., ETH/USD: `0x694AA1769357215DE4FAC081bf1f309aDC325306`)
+- **Change market duration** — Update `durationSeconds` in `market-creation/config.staging.json`
+- **Change resolution frequency** — Update `schedule` in `market-resolution/config.staging.json`
+- **Change dispute window** — Deploy a new contract with a different `disputeWindow` arg
+
+For full details, see the [TypeScript README](https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/prediction-market/prediction-market-ts) on GitHub.
diff --git a/src/content/cre-templates/read-data-feeds.mdx b/src/content/cre-templates/read-data-feeds.mdx
index b1877a1f621..fe189363085 100644
--- a/src/content/cre-templates/read-data-feeds.mdx
+++ b/src/content/cre-templates/read-data-feeds.mdx
@@ -4,6 +4,17 @@ description: "A set of minimal examples that read from Chainlink Data Feeds usin
 excerpt: "Learn how to read onchain data via contract calls using Chainlink Data Feeds."
 author: "Chainlink Labs"
 image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "read-data-feeds-ts"
+  - label: "Go"
+    id: "read-data-feeds-go"
+  - label: "TypeScript (MVR)"
+    id: "read-mvr-data-feeds-ts"
+  - label: "Go (MVR)"
+    id: "read-mvr-data-feeds-go"
+tags:
+  - "data-feeds"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/building-blocks/read-data-feeds"
 githubRepoLinks:
   - label: "Go"
diff --git a/src/content/cre-templates/stablecoin-ace-ccip.mdx b/src/content/cre-templates/stablecoin-ace-ccip.mdx
index f80ad960ac9..6fc9e68f577 100644
--- a/src/content/cre-templates/stablecoin-ace-ccip.mdx
+++ b/src/content/cre-templates/stablecoin-ace-ccip.mdx
@@ -4,6 +4,10 @@ description: "A demo stablecoin issuance system demonstrating CRE integrated wit
 author: "Chainlink Labs"
 excerpt: "Build a compliant, multi-chain stablecoin using Chainlink's complete service stack."
 image: "thumbnail.jpg"
+tags:
+  - "stablecoin"
+  - "cross-chain"
+  - "proof-of-reserve"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/stablecoin-ace-ccip"
 githubRepoLinks:
   - label: "TypeScript"
@@ -12,7 +16,7 @@ datePublished: "2026-02-13"
 lastModified: "2026-02-13"
 ---
 
-import { Aside, Accordion } from "@components"
+import { Aside, Accordion, ClickToZoom } from "@components"
 
 ## What This Template Does
 
@@ -41,56 +45,17 @@ This repository demonstrates how financial institutions can build a **secure, co
 
 ### Flow 1: Stablecoin Issuance with PoR + ACE
 
-```mermaid
-sequenceDiagram
-    actor User
-    participant CRE as CRE Workflow
-    participant PoR as PoR API
-    participant Forwarder as CRE Forwarder
-    participant Consumer as MintingConsumerWithACE
-    participant Stablecoin as Stablecoin Contract
-
-    User->>CRE: HTTP Trigger (Deposit $1000 USD)
-    CRE->>PoR: HTTP Capability (Fetch Reserves)
-    PoR-->>CRE: Reserves: $500,000
-    alt Sufficient Reserves
-        CRE->>Forwarder: On Chain Write (Submit Mint Report)
-        Forwarder->>Consumer: Call onReport()
-        Consumer->>Consumer: Run PolicyEngine (BlacklistPolicy)
-        alt Not Blacklisted
-            Consumer->>Stablecoin: mint(user, 1000e18)
-            Stablecoin-->>User: Tokens Minted
-        else Blacklisted
-            Consumer-->>User: Minting Failed
-        end
-    else Insufficient Reserves
-        CRE-->>User: PoR Validation Failed
-    end
-```
+<ClickToZoom
+  src="/images/cre-templates/templates/stablecoin-flow1.png"
+  alt="Stablecoin Issuance with PoR and ACE flow diagram"
+/>
 
 ### Flow 2: Cross-Chain Transfer with ACE
 
-```mermaid
-sequenceDiagram
-    actor Sender
-    participant CRE as CRE Workflow
-    participant Consumer as CCIPTransferConsumerWithACE
-    participant Stablecoin as Stablecoin Contract
-    participant Router as CCIP Router
-    participant Destination as Destination Chain
-
-    Sender->>CRE: HTTP Trigger (Transfer 500 tokens to Fuji)
-    CRE->>Consumer: Call onReport()
-    Consumer->>Consumer: Run PolicyEngine (VolumePolicy)
-    alt Amount Within Limit
-        Consumer->>Router: ccipSend(destinationChain, message)
-        Router->>Stablecoin: Burn Tokens on Source
-        Router->>Destination: Send CCIP Message (~10-20 min)
-        CRE-->>Sender: Transfer Initiated
-    else Amount Exceeds Limit
-        CRE-->>Sender: Transfer Failed
-    end
-```
+<ClickToZoom
+  src="/images/cre-templates/templates/stablecoin-flow2.png"
+  alt="Cross-Chain Transfer with ACE flow diagram"
+/>
 
 ---
 
diff --git a/src/content/cre-templates/tokenized-asset-servicing.mdx b/src/content/cre-templates/tokenized-asset-servicing.mdx
index c360345cfe7..7c7398dfd7e 100644
--- a/src/content/cre-templates/tokenized-asset-servicing.mdx
+++ b/src/content/cre-templates/tokenized-asset-servicing.mdx
@@ -4,6 +4,10 @@ description: "Demonstrates CRE integration with LogTrigger and HTTP abilities to
 author: "Chainlink Labs"
 excerpt: "Track the full lifecycle of tokenized real-world assets using CRE, AWS DynamoDB, and Lambda."
 image: "thumbnail.jpg"
+tags:
+  - "tokenized-assets"
+  - "asset-servicing"
+  - "compliance"
 githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/tokenized-asset-servicing"
 githubRepoLinks:
   - label: "TypeScript"
@@ -12,7 +16,7 @@ datePublished: "2026-02-13"
 lastModified: "2026-02-13"
 ---
 
-import { Aside, Accordion } from "@components"
+import { Aside, Accordion, ClickToZoom } from "@components"
 
 ## What This Template Does
 
@@ -42,30 +46,10 @@ This architecture decouples on-chain immutability from off-chain accessibility,
 
 ## Flow Diagram
 
-```mermaid
-sequenceDiagram
-    participant Contract as Smart Contract<br/>(Ethereum Sepolia)
-    participant CRE as Chainlink CRE<br/>(LogTrigger/HTTPTrigger)
-    participant Lambda as AWS Lambda
-    participant DynamoDB as AWS DynamoDB
-
-    Note over Contract,DynamoDB: Asset Registration Flow
-    Contract->>Contract: Emit AssetRegistered event
-    Contract-->>CRE: Event Log (LogTrigger)
-    CRE->>CRE: Parse event data
-    CRE->>Lambda: POST /function-url (HTTP Ability)
-    Lambda->>DynamoDB: PutItem (AssetId, Name, Issuer, Supply)
-
-    Note over Contract,DynamoDB: Asset Verification Flow
-    Contract->>Contract: Emit AssetVerified event
-    Contract-->>CRE: Event Log (LogTrigger)
-    CRE->>Lambda: POST verification data
-    Lambda->>DynamoDB: UpdateItem (Add Verified: true)
-
-    Note over Contract,DynamoDB: UID Update Flow (Bidirectional)
-    CRE->>CRE: Receive HTTP Trigger
-    CRE->>Contract: updateAssetMetadata(assetId, uid)
-```
+<ClickToZoom
+  src="/images/cre-templates/templates/tokenized-asset-flow.png"
+  alt="Tokenized Asset Servicing flow diagram"
+/>
 
 ---
 
diff --git a/src/content/cre-templates/vault-harvester.mdx b/src/content/cre-templates/vault-harvester.mdx
new file mode 100644
index 00000000000..3b3bd4c7550
--- /dev/null
+++ b/src/content/cre-templates/vault-harvester.mdx
@@ -0,0 +1,112 @@
+---
+title: "Vault Harvester"
+description: "Automated DeFi vault harvesting — check if yield is profitable, then harvest and compound using CRE."
+author: "Chainlink Labs"
+excerpt: "Automate DeFi vault yield harvesting with profitability checks and on-chain execution."
+image: "thumbnail.jpg"
+cliTemplateIds:
+  - label: "TypeScript"
+    id: "vault-harvester-ts"
+tags:
+  - "vault-harvester"
+  - "yield"
+  - "defi"
+githubUrl: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/vault-harvester"
+githubRepoLinks:
+  - label: "TypeScript"
+    url: "https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/vault-harvester/vault-harvester-ts"
+datePublished: "2026-03-19"
+lastModified: "2026-03-19"
+---
+
+import { Aside, Accordion, ClickToZoom } from "@components"
+
+## What This Template Does
+
+This template automates **DeFi vault harvesting** — a specialized version of the keeper pattern for vault-specific operations like yield harvesting and compounding.
+
+The workflow:
+
+1. **Cron trigger** fires every 5 minutes (configurable)
+2. **Reads** vault state: `shouldHarvest()`, `pendingYield()`, `totalHarvested()`, `harvestCount()`
+3. **If profitable** (time elapsed AND yield > threshold): Sends a signed report to trigger harvest on-chain
+4. **If not profitable**: Logs and skips — no wasted gas on unprofitable harvests
+5. **On-chain**: Harvests pending yield, resets state, and emits an event
+
+This pattern is compatible with vault protocols like Beefy, Yearn, and Alchemix.
+
+**Key Technologies:**
+
+- **CRE (Chainlink Runtime Environment)** — Orchestrates periodic workflows with DON consensus
+- **Profitability checking** — Time + yield threshold validation off-chain
+- **Yield tracking** — Harvest counter and history
+
+---
+
+## How It Works
+
+<ClickToZoom src="/images/cre-templates/templates/vault-harvester.png" alt="Vault Harvester workflow diagram" />
+
+---
+
+## Getting Started
+
+<Accordion title="Install dependencies" number={1}>
+
+```bash
+cd my-workflow && bun install && cd .. && cd contracts && bun install && cd ..
+```
+
+</Accordion>
+
+<Accordion title="Run tests" number={2}>
+
+```bash
+cd my-workflow && bun test
+```
+
+</Accordion>
+
+<Accordion title="Simulate the workflow" number={3}>
+
+Dry run:
+
+```bash
+cre workflow simulate my-workflow --target staging-settings
+```
+
+With broadcast (writes on-chain):
+
+```bash
+cre workflow simulate my-workflow --target staging-settings --broadcast
+```
+
+</Accordion>
+
+<Accordion title="Deploy your own contract" number={4}>
+
+Deploy `VaultHarvester` with constructor arguments: forwarder address, harvest interval in seconds, and minimum yield threshold in wei:
+
+```bash
+forge create src/VaultHarvester.sol:VaultHarvester \
+  --broadcast --private-key <KEY> --rpc-url <RPC> \
+  --constructor-args 0x15fc6ae953e024d975e77382eeec56a9101f9f88 300 1000000000000000000
+```
+
+Simulate yield accrual for testing:
+
+```bash
+cast send <YOUR_CONTRACT> "accrueYield(uint256)" 2000000000000000000
+```
+
+Then update `contractAddress` in `my-workflow/config.staging.json`.
+
+</Accordion>
+
+## Customization
+
+- **Change schedule** — Edit `schedule` in `config.staging.json` (cron syntax)
+- **Change profitability check** — Modify `shouldHarvest()` in the contract
+- **Change harvest logic** — Update `_processReport()` for your vault's harvest + compound strategy
+
+For full details, see the [TypeScript README](https://github.com/smartcontractkit/cre-templates/tree/main/starter-templates/vault-harvester/vault-harvester-ts) on GitHub.
diff --git a/src/content/cre-templates/x402-price-alerts.mdx b/src/content/cre-templates/x402-price-alerts.mdx
index 24bc2b6d0d6..6782c433eb3 100644
--- a/src/content/cre-templates/x402-price-alerts.mdx
+++ b/src/content/cre-templates/x402-price-alerts.mdx
@@ -4,6 +4,10 @@ description: "A crypto price alert system integrating x402 micropayments, Chainl
 excerpt: "Build a complete crypto price alert system with x402 payments, CRE on-chain automation, Chainlink Price Feeds, and AI-powered chat."
 author: "Chainlink Labs"
 image: "thumbnail.jpg"
+tags:
+  - "x402"
+  - "data-feeds"
+  - "ai"
 githubUrl: "https://github.com/smartcontractkit/x402-cre-price-alerts"
 githubRepoLinks:
   - label: "TypeScript"
diff --git a/src/layouts/CRETemplateLayout.astro b/src/layouts/CRETemplateLayout.astro
index f3e3a719cb6..a697369a868 100644
--- a/src/layouts/CRETemplateLayout.astro
+++ b/src/layouts/CRETemplateLayout.astro
@@ -9,10 +9,9 @@ import { CRETemplatesFrontmatter } from "~/content.config.ts"
 interface Props {
   frontmatter: CRETemplatesFrontmatter
   headings: MarkdownHeading[]
-  templateSlug: string
 }
 
-const { frontmatter, headings, templateSlug } = Astro.props
+const { frontmatter, headings } = Astro.props
 ---
 
 <BaseLayout
@@ -34,7 +33,7 @@ const { frontmatter, headings, templateSlug } = Astro.props
           </svg>
           <span>Back to Hub</span>
         </a>
-        <CRETemplateOverview {frontmatter} {templateSlug} />
+        <CRETemplateOverview {frontmatter} />
       </div>
     </div>
 
diff --git a/src/pages/cre-templates/[...id].astro b/src/pages/cre-templates/[...id].astro
index 9802d503951..a680bc0f7f7 100644
--- a/src/pages/cre-templates/[...id].astro
+++ b/src/pages/cre-templates/[...id].astro
@@ -10,21 +10,20 @@ export async function getStaticPaths() {
 
     return {
       params: { id: routeId },
-      props: { entry, templateSlug: routeId },
+      props: { entry },
     }
   })
 }
 
 interface Props {
   entry: Awaited<ReturnType<typeof getCollection<"cre-templates">>>[number]
-  templateSlug: string
 }
 
-const { entry, templateSlug } = Astro.props
+const { entry } = Astro.props
 
 const { Content, headings } = await render(entry)
 ---
 
-<CRETemplateLayout frontmatter={entry.data} {headings} {templateSlug}>
+<CRETemplateLayout frontmatter={entry.data} {headings}>
   <Content />
 </CRETemplateLayout>
diff --git a/src/pages/cre-templates/index.astro b/src/pages/cre-templates/index.astro
index d05aea04b88..3f3f47dbf29 100644
--- a/src/pages/cre-templates/index.astro
+++ b/src/pages/cre-templates/index.astro
@@ -66,12 +66,9 @@ const pageDescription =
               </div>
               <div class="featured-content">
                 <div class="featured-badges">
-                  {(() => {
-                    const langs = [
-                      ...new Set(featuredTemplate.data.githubRepoLinks.map((l) => l.label.replace(/\s*\(.*\)/, ""))),
-                    ].sort((a, b) => (a === "TypeScript" ? -1 : b === "TypeScript" ? 1 : a.localeCompare(b)))
-                    return langs.map((lang) => <span class="featured-badge">{lang.toUpperCase()}</span>)
-                  })()}
+                  {(featuredTemplate.data.tags ?? []).slice(0, 3).map((tag) => (
+                    <span class="featured-badge">{tag}</span>
+                  ))}
                 </div>
                 <h3>{featuredTemplate.data.title}</h3>
                 <p>{featuredTemplate.data.description}</p>
@@ -127,6 +124,7 @@ const pageDescription =
                   image={template.data.image}
                   href={`/cre-templates/${template.id}`}
                   languages={template.data.githubRepoLinks.map((link) => link.label)}
+                  tags={template.data.tags}
                   author={template.data.author}
                 />
               ))}