diff --git a/.github/workflows/scaffold-cross-platform.yml b/.github/workflows/scaffold-cross-platform.yml
index f209c34..ea92312 100644
--- a/.github/workflows/scaffold-cross-platform.yml
+++ b/.github/workflows/scaffold-cross-platform.yml
@@ -18,7 +18,7 @@ env:
   # Full registry URLs: published PyPI 0.1.0 does not resolve catalog slugs.
   # After create-awesome-python-app>=0.2.0 ships resolve_catalog_spec, slugs also work.
   CPA_TEMPLATE_FASTAPI: https://github.com/Create-Python-App/cpa-templates?subdir=templates/fastapi-starter
-  CPA_ADDON_DOCKER: https://github.com/Create-Python-App/cpa-templates?subdir=extensions/python-docker
+  CPA_ADDON_DOCKER: https://github.com/Create-Python-App/cpa-templates?subdir=extensions/fastapi-docker
 
 jobs:
   scaffold:
@@ -72,7 +72,7 @@ jobs:
           PY
 
   addon-smoke:
-    name: ubuntu-latest / fastapi-starter + python-docker
+    name: ubuntu-latest / fastapi-starter + fastapi-docker
     runs-on: ubuntu-latest
     steps:
       - uses: astral-sh/setup-uv@v7
diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md
index 6ca4ca9..9aeef63 100644
--- a/docs/MIGRATION.md
+++ b/docs/MIGRATION.md
@@ -104,7 +104,7 @@ slugs fail with a hint to pass a full URL.
 
 ```text
 https://github.com/Create-Python-App/cpa-templates?subdir=templates/fastapi-starter
-https://github.com/Create-Python-App/cpa-templates?subdir=extensions/github-setup
+https://github.com/Create-Python-App/cpa-templates?subdir=extensions/all-github-setup
 ```
 
 **Local `file://` URLs.** For forks, air-gapped work, or integration tests:
diff --git a/fixtures/catalog/templates.json b/fixtures/catalog/templates.json
index 52631d8..0daed6b 100644
--- a/fixtures/catalog/templates.json
+++ b/fixtures/catalog/templates.json
@@ -50,7 +50,7 @@
       "name": "GitHub Setup",
       "slug": "github-setup",
       "description": "GitHub Actions CI, Dependabot, issue templates",
-      "url": "https://github.com/Create-Python-App/cpa-templates?subdir=extensions/github-setup",
+      "url": "https://github.com/Create-Python-App/cpa-templates?subdir=extensions/all-github-setup",
       "type": ["fastapi-backend"],
       "category": "tooling",
       "labels": ["GitHub", "CI"]
diff --git a/packages/create-awesome-python-app/tests/test_catalog_resolve.py b/packages/create-awesome-python-app/tests/test_catalog_resolve.py
index 46e7b73..cbb55dc 100644
--- a/packages/create-awesome-python-app/tests/test_catalog_resolve.py
+++ b/packages/create-awesome-python-app/tests/test_catalog_resolve.py
@@ -32,7 +32,7 @@
     "extensions": [
         {
             "slug": "github-setup",
-            "url": "https://github.com/Create-Python-App/cpa-templates?subdir=extensions/github-setup",
+            "url": "https://github.com/Create-Python-App/cpa-templates?subdir=extensions/all-github-setup",
         }
     ],
 }
@@ -258,10 +258,13 @@ def test_validate_extension_compatibility_ok() -> None:
                 "url": "file:///ext/github",
                 "incompatibleWith": ["other"],
             },
-            {"slug": "python-docker", "url": "file:///ext/docker"},
+            {"slug": "fastapi-docker", "url": "file:///ext/docker"},
         ]
     }
-    validate_extension_compatibility(["github-setup", "python-docker"], catalog=catalog)
+    validate_extension_compatibility(
+        ["github-setup", "fastapi-docker"],
+        catalog=catalog,
+    )
 
 
 def test_validate_extension_compatibility_fails_on_pair() -> None:
diff --git a/packages/create-awesome-python-app/tests/test_cpa_templates_integration.py b/packages/create-awesome-python-app/tests/test_cpa_templates_integration.py
index adac7be..774db7f 100644
--- a/packages/create-awesome-python-app/tests/test_cpa_templates_integration.py
+++ b/packages/create-awesome-python-app/tests/test_cpa_templates_integration.py
@@ -14,7 +14,7 @@
     os.environ.get("CPA_TEMPLATES_ROOT", str(_DEFAULT_CPA_TEMPLATES))
 ).resolve()
 FASTAPI_TEMPLATE = CPA_TEMPLATES_ROOT / "templates" / "fastapi-starter"
-GITHUB_SETUP = CPA_TEMPLATES_ROOT / "extensions" / "github-setup"
+GITHUB_SETUP = CPA_TEMPLATES_ROOT / "extensions" / "all-github-setup"
 
 
 def _cpa_templates_available() -> bool:
@@ -143,7 +143,7 @@ def test_scaffold_via_catalog_addon_slug(
         "extensions": [
             {
                 "slug": "github-setup",
-                "url": f"file://{repo}?subdir=extensions/github-setup",
+                "url": f"file://{repo}?subdir=extensions/all-github-setup",
             }
         ],
         "categories": [],
@@ -196,7 +196,7 @@ def test_scaffold_fastapi_with_github_setup_extension(
             "--template",
             f"file://{repo}?subdir=templates/fastapi-starter",
             "--addons",
-            f"file://{repo}?subdir=extensions/github-setup",
+            f"file://{repo}?subdir=extensions/all-github-setup",
             "--no-interactive",
             "--no-install",
             str(dest),