diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..8253a489f
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,15 @@
+# For workflows/labeler.yml
+
+"re:docs": '*.+(md|org)'
+
+":core":       ['core/*.el', 'docs/*']
+":core lib":   'core/autoload/**/*.el'
+"re:packages": '**/packages.el'
+
+"re:bin":             ['bin/**/*', '!bin/doom']
+"re:bin/doom":        ['core/core-cli.el', 'core/cli/*', 'bin/doom']
+"re:bin/doom:doctor": '**/doctor.el'
+"re:bin/doom:env":    'core/cli/env.el'
+
+
+# TODO automate generation of labels for modules
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000..ac7760f9e
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,26 @@
+name: 'Auto-label Issues/PRs'
+on:
+  pull_request:
+    types: [opened]
+  issues:
+    types: [opened]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: is-sponsor-label
+    env:
+      GITHUB_TOKEN: ${{ github.token }}
+    steps:
+      # - name: Checkout
+      #   uses: actions/checkout@v2
+      - uses: actions/labeler@main
+        description: "Auto-label PRs by target files (see ../labeler.yml)"
+      - uses: JasonEtco/is-sponsor-label-action@v1
+        description: "Label issues/PRs created by sponsors"
+        with:
+          label: ':heart:'
+      # - name: Synchronize labels
+      #   uses: julb/action-manage-label@v1
+      #   with:
+      #     from: .github/labels.yml
+      #     skip_delete: false
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index d3c7fdc44..c32330481 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -11,4 +11,4 @@ jobs:
       - uses: dessant/lock-threads@v2
         with:
           github-token: ${{ github.token }}
-          issue-lock-inactive-days: '180'
+          issue-lock-inactive-days: '90'
diff --git a/.github/workflows/needs-reply.yml b/.github/workflows/needs-reply.yml
deleted file mode 100644
index a7fbdf4e3..000000000
--- a/.github/workflows/needs-reply.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Remove needs-reply label
-
-on:
-  issue_comment:
-    types:
-      - created
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove needs-reply label
-        uses: octokit/request-action@v2.x
-        continue-on-error: true
-        with:
-          route: DELETE /repos/:repository/issues/:issue/labels/:label
-          repository: ${{ github.repository }}
-          issue: ${{ github.event.issue.number }}
-          label: "status:needs-reply"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 222b276ca..602cb4bac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,37 +1,39 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - develop
   pull_request:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.org'
+      - '.dir-locals.el'
+      - 'LICENSE'
     branches:
+      - main
       - develop
 
 jobs:
   build:
-    if: false
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        emacs_version:
-          - 26.3
-          - 27.1
-        include:
-          - emacs_version: 26.3
-            lint_ignore: 1
-    env:
-      EMACS_LINT_IGNORE: ${{ matrix.lint_ignore }}
+        os: [ubuntu-latest, macos-latest]
+        emacs_version: [27.1, 27.2, snapshot]
     steps:
       - uses: purcell/setup-emacs@master
         with:
           version: ${{ matrix.emacs_version }}
-
-      - uses: actions/checkout@v2
-      - name: Doom version
-        run: "bin/doom version"
-      - name: Run tests
-        run: "bin/doom test"
+      - name: Check out doom-emacs
+        uses: actions/checkout@v2
+      - name: Set up test Doom profile
+        run:  bin/doom test
+      - name: Cache package builds
+        uses: actions/cache@v2
+        with:
+          path: .local/straight/repos
+          key: ${{ runner.os }}-build-doom-packages-${{ hashFiles('**/packages.el') }}
+          restore-keys: |
+            ${{ runner.os }}-build-doom-packages-
       # FIXME
       # name: Compile
       #   run: "bin/doom -y compile"