diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7a800ec..90c45ab 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -20,6 +20,3 @@ RUN . /etc/os-release \
 
 # [Optional] Uncomment if you want to install more global node modules
 # RUN su node -c "npm install -g <your-package-list-here>"
-
-
-
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index b7ba686..dd41e4d 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -33,4 +33,4 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
 volumes:
-  mongodb-data:
\ No newline at end of file
+  mongodb-data:
diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg
new file mode 100755
index 0000000..cb932df
--- /dev/null
+++ b/.husky/prepare-commit-msg
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+exec < /dev/tty && npx cz --hook || true
diff --git a/package.json b/package.json
index 7adb1ca..792121c 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,13 @@
     "new-secret": "node new_secret.js",
     "dev": "nodemon app.js",
     "start": "node app.js",
-    "lint": "npm run lint:es",
+    "lint": "npx lint-staged",
     "lint:es": "eslint \"*.js\" \"src/**/*.js\"",
     "lint:es:fix": "eslint \"*.js\" \"src/**/*.js\" --fix",
     "test": "mocha test --exit --recursive --timeout 5000",
     "cover": "nyc mocha test --recursive --timeout 5000 --exit",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "commit": "cz"
   },
   "lint-staged": {
     "*.js": "eslint"
@@ -36,6 +37,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
+    "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.17.0",
     "eslint-config-google": "^0.14.0",
     "husky": "^8.0.1",
@@ -45,5 +47,10 @@
     "nodemon": "^2.0.13",
     "nyc": "^15.1.0",
     "supertest": "^6.2.3"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }