diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 7b35e00..3859f4e 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -28,12 +28,3 @@ jobs:
           .github/scripts/check-changelog-commit.sh
           "${{ github.event.pull_request.base.sha }}"
 
-  shellcheck:
-    name: Shellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install shellcheck
-        run: sudo apt-get install -y shellcheck
-      - name: Run shellcheck
-        run: make lint-shell
diff --git a/.github/workflows/ci-per-commit.yaml b/.github/workflows/ci-per-commit.yaml
index ab408fd..cf11632 100644
--- a/.github/workflows/ci-per-commit.yaml
+++ b/.github/workflows/ci-per-commit.yaml
@@ -39,7 +39,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: "3.13"
       - name: Determine commit range
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
new file mode 100644
index 0000000..dcd8dbe
--- /dev/null
+++ b/.github/workflows/shellcheck.yml
@@ -0,0 +1,16 @@
+name: Shellcheck
+on: push
+
+permissions:
+  contents: read
+
+jobs:
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Install shellcheck
+        run: sudo apt-get install -y shellcheck
+      - name: Run shellcheck
+        run: make lint-shell
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd3a1d4..df09ba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Infrastructure
+
+- CI: move shellcheck into its own dedicated workflow, separate from changelog
+  checks ([8c9bace], [#65])
+- CI: bump astral-sh/setup-uv from 6 to 7 ([c9216ba], [#64])
+
 ## [2.0.0] - 2026-03-16
 
 ### Changed
@@ -191,6 +197,8 @@ and this project adheres to
 <!-- Commit links -->
 
 [fa582dc]: https://github.com/LeakIX/l9format-python/commit/fa582dc
+[c9216ba]: https://github.com/LeakIX/l9format-python/commit/c9216ba
+[8c9bace]: https://github.com/LeakIX/l9format-python/commit/8c9bace
 [bc4872d]: https://github.com/LeakIX/l9format-python/commit/bc4872d
 [6c9eecd]: https://github.com/LeakIX/l9format-python/commit/6c9eecd
 [961f9ee]: https://github.com/LeakIX/l9format-python/commit/961f9ee
@@ -288,3 +296,5 @@ and this project adheres to
 [#59]: https://github.com/LeakIX/l9format-python/issues/59
 [#62]: https://github.com/LeakIX/l9format-python/pull/62
 [#43]: https://github.com/LeakIX/l9format-python/issues/43
+[#64]: https://github.com/LeakIX/l9format-python/pull/64
+[#65]: https://github.com/LeakIX/l9format-python/pull/65