diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f1894e4db..be72f6139 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,6 +13,8 @@ updates:
       actions:
         patterns:
           - "*"
+    commit-message:
+      prefix: "chore"
 
   - package-ecosystem: "pip"
     directory: "/"
@@ -25,3 +27,5 @@ updates:
     ignore:
       - dependency-name: "pydantic"
         versions: [">=2.0"]
+    commit-message:
+      prefix: "chore"
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 000000000..e4f482a6a
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,15 @@
+name: PR Conventional Commit Validation
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  validate-pr-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Conventional Commit Validation
+        uses:  ytanikin/pr-conventional-commits@1.4.1
+        with:
+          task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert"]'
+          add_label: 'false'
diff --git a/docs/explanations/decisions/0006-conventional-commits.md b/docs/explanations/decisions/0006-conventional-commits.md
new file mode 100644
index 000000000..8a73726b2
--- /dev/null
+++ b/docs/explanations/decisions/0006-conventional-commits.md
@@ -0,0 +1,25 @@
+# 3. Short descriptive title
+
+Date: 2025-04-15
+
+## Status
+
+Accepted
+
+## Context
+
+Blueapi publishes not only the library code but also a containerised service & helm chart.
+Each of the published artifacts are in flux and in periods of adoption, where new users may adopt its use amidst major version changes.
+To give some certainty to users, we should document changes and highlight important ones.
+As dependency management becomes more automated, we should ensure that semantic versioning is used accurately, and make allowances for automation.
+
+## Decision
+
+Commits to the default branch of the copier template should be made using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/), and the Conventional Commit standard should be used to identify the next released version and create changelogs/release notes.
+
+## Consequences
+
+A [GitHub Action](https://github.com/ytanikin/PRConventionalCommits) has been configured to ensure that PRs may not be merged without being in the form of a Conventional Commit.
+PRs will be squash-and-merged, with the complete git history of the change preserved in the PR but only a single commit on the default branch.
+PR commit messages will be taken from the title and body of the PR, ensuring that the commit will be compatible with the standard.
+Tooling (dependabot etc.) will be configured to make compatible PRs.