diff --git a/.hooks/commit-msg b/.hooks/commit-msg
new file mode 100755
index 0000000..572b20b
--- /dev/null
+++ b/.hooks/commit-msg
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+task commitlint -- --commit-msg-file $1
diff --git a/.hooks/pre-commit b/.hooks/pre-commit
deleted file mode 100755
index dc49036..0000000
--- a/.hooks/pre-commit
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-task check
diff --git a/.hooks/pre-push b/.hooks/pre-push
new file mode 100755
index 0000000..76d7270
--- /dev/null
+++ b/.hooks/pre-push
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec </dev/tty && task check --output prefixed
diff --git a/.hooks/prepare-commit-msg b/.hooks/prepare-commit-msg
new file mode 100755
index 0000000..02d42ba
--- /dev/null
+++ b/.hooks/prepare-commit-msg
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [[ $2 != "message" && $3 == "" ]]; then
+  exec </dev/tty && task commit -- --dry-run --write-message-to-file $1
+fi
diff --git a/Taskfile.yml b/Taskfile.yml
index 0d0f694..9fb403c 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -4,8 +4,6 @@ version: "3"
 vars:
   DB_URL: "postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable"
 
-output: prefixed
-
 tasks:
   # Docker-related tasks
   up:
@@ -175,3 +173,9 @@ tasks:
       - task: migrate-drop
       - task: migrate-up
       - task: seed
+  commitlint:
+    desc: "Lint commit message for conventional commit structure"
+    cmd: docker-compose --profile "scripts" run -T --rm commitizen cz check {{.CLI_ARGS}}
+  commit:
+    desc: "Interactive builder for conventional commits"
+    cmd: docker-compose --profile "scripts" run -i --rm commitizen cz commit {{.CLI_ARGS}}
diff --git a/commitizen.Dockerfile b/commitizen.Dockerfile
new file mode 100644
index 0000000..9e956dc
--- /dev/null
+++ b/commitizen.Dockerfile
@@ -0,0 +1,5 @@
+FROM ghcr.io/astral-sh/uv:0.8.8-python3.9-alpine
+RUN apk update && apk add git
+RUN uv tool install commitizen
+WORKDIR /app
+CMD [ "cz" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1bd5d4f..50130dd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -268,3 +268,12 @@ services:
       - object-storage:minio
     profiles:
       - "scripts"
+  commitizen:
+    # This specifies the docker file/context to build for the api container
+    build:
+      context: .
+      dockerfile: commitizen.Dockerfile
+    volumes:
+      - .:/app
+    profiles:
+      - "scripts"