diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97344eb5580..ead17da98de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -181,6 +181,7 @@ jobs:
     name: Nimbus Build
     needs: pre-build
     runs-on: ubuntu-latest
+    continue-on-error: true
     outputs:
       succeeded: ${{ steps.build.outputs.succeeded }}
     permissions:
@@ -235,10 +236,12 @@ jobs:
           echo "succeeded=true" >> "$GITHUB_OUTPUT"
 
       - name: Upload Nimbus build artifact
+        if: always()
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         with:
           name: dist-nimbus
           path: dist-nimbus
+          if-no-files-found: ignore
 
       - name: Upload Nimbus build log
         if: always()
@@ -250,7 +253,7 @@ jobs:
 
   post-build:
     name: Post Build
-    needs: [build, nimbus-build]
+    needs: build
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -287,8 +290,8 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
-          name: dist-nimbus
-          path: dist-nimbus
+          name: dist
+          path: dist
 
       - name: Tests (Workers)
         run: pnpm run test:postbuild
@@ -362,7 +365,7 @@ jobs:
 
   publish-preview:
     name: Deploy Preview
-    needs: [build, nimbus-build]
+    needs: build
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     permissions:
@@ -400,8 +403,8 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
-          name: dist-nimbus
-          path: dist-nimbus
+          name: dist
+          path: dist
 
       - name: Deploy to Cloudflare Workers
         id: deploy
diff --git a/.github/workflows/publish-production.yml b/.github/workflows/publish-production.yml
index 03e9349abb1..eae4d2bd7a6 100644
--- a/.github/workflows/publish-production.yml
+++ b/.github/workflows/publish-production.yml
@@ -41,23 +41,22 @@ jobs:
         uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
         with:
           path: |
-            .astro-cache-nimbus/assets
-          key: astro-nimbus-assets-${{ hashFiles('src/assets/**') }}
+            .astro-cache/assets
+          key: astro-assets-${{ hashFiles('src/assets/**') }}
           restore-keys: |
-            astro-nimbus-assets-
+            astro-assets-
 
       - name: Build
         run: pnpm run build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BUILD_TARGET: nimbus
 
       - name: Upload artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         continue-on-error: true
         with:
           name: site-html
-          path: dist-nimbus
+          path: dist
 
       - name: Deploy to Cloudflare Workers
         run: pnpm exec wrangler deploy
diff --git a/bin/post-pr-ci-failure-comment/index.ts b/bin/post-pr-ci-failure-comment/index.ts
index 3fc56568d23..0afca2394e5 100644
--- a/bin/post-pr-ci-failure-comment/index.ts
+++ b/bin/post-pr-ci-failure-comment/index.ts
@@ -28,14 +28,11 @@ async function run(): Promise<void> {
 			(job) =>
 				job.name === "Pre Build" ||
 				job.name === "Build" ||
-				job.name === "Nimbus Build" ||
 				job.name === "Post Build",
 		);
 
 		if (ciJobs.length === 0) {
-			core.setFailed(
-				`Could not find Pre Build, Build, Nimbus Build, or Post Build jobs`,
-			);
+			core.setFailed(`Could not find Pre Build, Build, or Post Build jobs`);
 			process.exit();
 		}
 
diff --git a/public/og-docs.png b/public/og-docs.png
index 42d508b2e59..4bcb0c46a4d 100644
Binary files a/public/og-docs.png and b/public/og-docs.png differ
diff --git a/src/nimbus/content.config.ts b/src/nimbus/content.config.ts
index 6c4d9999e6c..b0274f68150 100644
--- a/src/nimbus/content.config.ts
+++ b/src/nimbus/content.config.ts
@@ -320,7 +320,7 @@ export const collections = {
 	// non-canonical here and stripped by the (non-strict) zod schema.
 	"compatibility-flags": defineCollection({
 		loader: glob({
-			pattern: "*.{md,mdx}",
+			pattern: "*.md",
 			base: "./src/content/compatibility-flags",
 		}),
 		schema: compatibilityFlagsSchema,
diff --git a/worker/index.ts b/worker/index.ts
index c9d915078ed..3eb1295710f 100644
--- a/worker/index.ts
+++ b/worker/index.ts
@@ -1,6 +1,6 @@
 import { WorkerEntrypoint } from "cloudflare:workers";
 import { generateRedirectsEvaluator } from "redirects-in-workers";
-import redirectsFileContents from "../dist-nimbus/__redirects";
+import redirectsFileContents from "../dist/__redirects";
 
 const redirectsEvaluator = generateRedirectsEvaluator(redirectsFileContents, {
 	maxLineLength: 10_000, // Usually 2_000
diff --git a/worker/index.worker.test.ts b/worker/index.worker.test.ts
index de138510bed..5a8ea5a3252 100644
--- a/worker/index.worker.test.ts
+++ b/worker/index.worker.test.ts
@@ -200,7 +200,9 @@ describe("Cloudflare Docs", () => {
 				const image = dom.querySelector("meta[property='og:image']")?.attributes
 					.content;
 
-				expect(image).toBe("https://developers.cloudflare.com/og-docs.png");
+				expect(image).toBe(
+					"https://developers.cloudflare.com/dev-products-preview.png",
+				);
 			});
 		});
 
diff --git a/wrangler.jsonc b/wrangler.jsonc
index bf5023abf46..527c54fc827 100644
--- a/wrangler.jsonc
+++ b/wrangler.jsonc
@@ -14,7 +14,7 @@
 		{ "type": "Text", "globs": ["**/__redirects"], "fallthrough": true },
 	],
 	"assets": {
-		"directory": "./dist-nimbus",
+		"directory": "./dist",
 		"binding": "ASSETS",
 		"not_found_handling": "404-page",
 		"run_worker_first": true,