diff --git a/.github/workflows/commit-lint.yaml b/.github/workflows/commit-lint.yaml
new file mode 100644
index 0000000000..163f5d6776
--- /dev/null
+++ b/.github/workflows/commit-lint.yaml
@@ -0,0 +1,24 @@
+name: Lint commits
+
+on:
+  merge_group:
+    types:
+      - checks_requested
+
+jobs:
+  semantic-message:
+    runs-on: blacksmith-2vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        with:
+          fetch-depth: 0
+      - name: Set up node
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        with:
+          node-version: "20.9"
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - name: Validate PR commits with commitlint
+        run: |
+          npx commitlint --from "$(git rev-parse origin/main)" --verbose
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 68e1a0e830..7c8d8be5ed 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,7 +11,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2204
     outputs:
       releases_created: ${{ steps.release-please.outputs.releases_created }}
       tag_name: ${{ steps.release-please.outputs.tag_name }}
@@ -31,7 +31,7 @@ jobs:
     if: ${{ needs.release-please.outputs.releases_created == 'true' }}
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
         uses: actions/checkout@v4