diff --git a/.commitlintrc.json b/.commitlintrc.json
deleted file mode 100644
index ecbe816956e..00000000000
--- a/.commitlintrc.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": ["@commitlint/config-conventional"],
-  "rules": {
-    "body-max-line-length": [0],
-    "footer-max-line-length": [0],
-    "header-max-length": [2, "always", 120]
-  }
-}
diff --git a/.github/workflows/commit-lint.yml b/.github/workflows/commit-lint.yml
index e9091ebd960..0a7b87937b9 100644
--- a/.github/workflows/commit-lint.yml
+++ b/.github/workflows/commit-lint.yml
@@ -6,4 +6,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
-      - uses: wagoid/commitlint-github-action@9763196e10f27aef304c9b8b660d31d97fce0f99 # v5.5.1
+      - uses: wagoid/commitlint-github-action@3d28780bbf0365e29b144e272b2121204d5be5f3 # v6.1.2
diff --git a/.github/workflows/semantic-pull-requests.yml b/.github/workflows/semantic-pull-requests.yml
index 5afe4420671..d04d43c4fd8 100644
--- a/.github/workflows/semantic-pull-requests.yml
+++ b/.github/workflows/semantic-pull-requests.yml
@@ -20,4 +20,4 @@ jobs:
         with:
           fetch-depth: 0
       - name: Validate commit messages
-        uses: wagoid/commitlint-github-action@9763196e10f27aef304c9b8b660d31d97fce0f99 # v5.5.1
+        uses: wagoid/commitlint-github-action@3d28780bbf0365e29b144e272b2121204d5be5f3 # v6.1.2
diff --git a/commitlint.config.mjs b/commitlint.config.mjs
new file mode 100644
index 00000000000..ad1be9dcf56
--- /dev/null
+++ b/commitlint.config.mjs
@@ -0,0 +1,8 @@
+export default {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'body-max-line-length': [0],
+    'footer-max-line-length': [0],
+    'header-max-length': [2, 'always', 120],
+  },
+};