diff --git a/material.angular.io/.github/workflows/ci.yml b/.github/workflows/ci.material-aio.yml
similarity index 85%
rename from material.angular.io/.github/workflows/ci.yml
rename to .github/workflows/ci.material-aio.yml
index ed784b25c86e..744cbdd5e87f 100644
--- a/material.angular.io/.github/workflows/ci.yml
+++ b/.github/workflows/ci.material-aio.yml
@@ -1,10 +1,12 @@
-name: CI
+name: 'CI (material.angular.io)'
 
 on:
   push:
     branches:
       - main
       - '[0-9]+.[0-9]+.x'
+    paths:
+      - 'material.angular.io/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,6 +17,7 @@ permissions: {}
 defaults:
   run:
     shell: bash
+    working-directory: material.angular.io
 
 env:
   # TODO: Remove when pnpm is exclusively used.
@@ -54,13 +57,14 @@ jobs:
         run: yarn bazel test --test_tag_filters=-lint,-e2e,-audit //...
       - name: Store Test Logs
         uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        if: always()
         with:
           name: test-logs
-          path: bazel-testlogs/
+          path: material.angular.io/bazel-testlogs/
           retention-days: 14
 
   lighthouse:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04 # Note, fails on Ubuntu 24.04. see https://github.com/actions/runner-images/issues/10636
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
@@ -70,7 +74,8 @@ jobs:
         run: yarn bazel test --test_tag_filters=audit //...
       - name: Store Audit Logs
         uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        if: always()
         with:
           name: lighthouse-logs
-          path: bazel-testlogs/
+          path: material.angular.io/bazel-testlogs/
           retention-days: 14
diff --git a/material.angular.io/.github/workflows/pr.yml b/.github/workflows/pr.material-aio.yml
similarity index 85%
rename from material.angular.io/.github/workflows/pr.yml
rename to .github/workflows/pr.material-aio.yml
index 27110a555aee..79e87d497071 100644
--- a/material.angular.io/.github/workflows/pr.yml
+++ b/.github/workflows/pr.material-aio.yml
@@ -1,8 +1,10 @@
-name: Pull Request
+name: 'CI (material.angular.io)'
 
 on:
   pull_request:
     types: [opened, synchronize, reopened]
+    paths:
+      - 'material.angular.io/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -13,6 +15,7 @@ permissions: {}
 defaults:
   run:
     shell: bash
+    working-directory: material.angular.io
 
 env:
   # TODO: Remove when pnpm is exclusively used.
@@ -52,13 +55,14 @@ jobs:
         run: yarn bazel test --test_tag_filters=-lint,-e2e,-audit //...
       - name: Store Test Logs
         uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        if: always()
         with:
           name: test-logs
-          path: bazel-testlogs/
+          path: material.angular.io/bazel-testlogs/
           retention-days: 14
 
   lighthouse:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04 # Note, fails on Ubuntu 24.04. see https://github.com/actions/runner-images/issues/10636
     steps:
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@359350bbc10aab1bac85d0eec61a53377078ab82
@@ -68,7 +72,8 @@ jobs:
         run: yarn bazel test --test_tag_filters=audit //...
       - name: Store Audit Logs
         uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        if: always()
         with:
           name: lighthouse-logs
-          path: bazel-testlogs/
+          path: material.angular.io/bazel-testlogs/
           retention-days: 14
diff --git a/material.angular.io/.github/ISSUE_TEMPLATE/docs-infra.md b/material.angular.io/.github/ISSUE_TEMPLATE/docs-infra.md
deleted file mode 100644
index 2318b6b5f8db..000000000000
--- a/material.angular.io/.github/ISSUE_TEMPLATE/docs-infra.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Docs Infrastructure
-about: Suggest an improvement to the infrastructure used to build material.angular.io
----
-
-<!--------
-🛑
-Use the Angular Components repository (https://github.com/angular/components/issues/new/choose)
-to report issues.
-
-The Angular team can't provide general troubleshooting help. This is especially true when the
-problem is specific to your app and cannot be reproduced in a StackBlitz demo. 
-However, the extended community of users may be able to provide help via the following channels: 
-- StackOverflow: https://stackoverflow.com/questions/tagged/angular-material2
-- Gitter: https://gitter.im/angular/material2
-- Google Groups: https://groups.google.com/forum/#!forum/angular-material2
--------->