diff --git a/.vscode/settings.json b/.vscode/settings.json
index 02bdeca9..e194902e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,29 +5,23 @@
   // Disable ShellCheck from Bash IDE as we use VS Code ShellCheck
   "bashIde.shellcheckPath": "",
   "cSpell.words": [
-    "C",
-    "CODESPACES",
-    "Cássio",
-    "DISTRO",
-    "Fira",
-    "NOPASSWD",
-    "Powerlevel",
-    "USERPROFILE",
     "asciinema",
     "chezmoi",
     "chmod",
     "choco",
-    "chsh",
+    "CODESPACES",
     "devcontainer",
+    "DISTRO",
     "dotfiles",
     "felipecrs",
-    "jfrog",
+    "Fira",
     "kubectl",
+    "NOPASSWD",
     "onedrive",
+    "Powerlevel",
     "shellcheck",
-    "ssio",
-    "submodule",
     "sudoers",
+    "USERPROFILE",
     "wslpath",
     "wslvar"
   ],
@@ -61,18 +55,19 @@
   },
   "files.associations": {
     "**/home/install": "shellscript",
-    "*_zshrc": "shellscript",
-    "*_antigenrc": "shellscript",
-    "*_profile.tmpl": "shellscript",
-    "*_bashrc": "shellscript",
-    "*_bash_aliases.tmpl": "shellscript",
-    "**/home/**/run_*": "shellscript",
+    "**/home/dot_gitmessage": "git-commit",
+    "**/home/dot_profile.tmpl": "shellscript",
+    "**/home/dot_bashrc": "shellscript",
+    "**/home/dot_bash_profile": "shellscript",
+    "**/home/dot_bash_aliases.tmpl": "shellscript",
+    "**/home/dot_zshrc": "shellscript",
     "**/home/**/executable_*": "shellscript",
     "**/home/**/modify_*": "helm",
     "*.yaml.tmpl": "helm",
     ".chezmoi*.yaml": "helm",
     ".chezmoiignore": "helm",
     ".chezmoiremove": "helm",
+    "**/.chezmoiscripts/run_*": "shellscript",
     "**/.chezmoitemplates/*": "helm",
     "**/.chezmoitemplates/*-library": "shellscript"
   }
diff --git a/home/.gitconfig.tmpl b/home/.gitconfig.tmpl
index 71bb371e..ef08a288 100644
--- a/home/.gitconfig.tmpl
+++ b/home/.gitconfig.tmpl
@@ -15,6 +15,10 @@ cmd = code --wait $MERGED
 [diff]
 tool = vscode
 
+[commit]
+template = ~/.gitmessage
+cleanup = strip
+
 [merge]
 autoStash = true
 tool = vscode
diff --git a/home/dot_gitmessage b/home/dot_gitmessage
new file mode 100644
index 00000000..ac3420d6
--- /dev/null
+++ b/home/dot_gitmessage
@@ -0,0 +1,56 @@
+##################################################
+# Title: What does this commit do?
+# - Start with an uppercase imperative verb.
+# - Do not end with a period.
+# - Limit to 50 characters (the width of the line below).
+##################################################
+
+
+########################################################################
+# Body: Why is this change happening?
+# - Describe the purpose, goal, use case, or user story.
+# - Leave a blank line above to separate from the title.
+# - Wrap lines at 72 characters (the width of the line below).
+########################################################################
+
+
+########################################################################
+# Body: How is this change happening?
+# - Describe relevant algorithms, protocols, or implementation details.
+# - Leave a blank line above to separate from the previous section.
+# - Wrap lines at 72 characters (the width of the line below).
+########################################################################
+
+
+########################################################################
+# Trailers: What references are relevant? (optional)
+# - Must be the last part of the commit message.
+# - Leave a blank line above to separate from the body.
+# - URLs in trailers do not need to be wrapped.
+#
+# Examples:
+#
+# Closes: #123
+# See: https://example.com/long-url-that-does-not-need-to-be-wrapped
+# Co-authored-by: Name <name@example.com>
+#
+########################################################################
+
+
+########################################################################
+# Reference: Imperative verbs for the title
+# Add      = Create a capability (feature, test, dependency)
+# Drop     = Delete a capability (feature, test, dependency)
+# Fix      = Fix an issue (bug, typo, accident, misstatement)
+# Bump     = Increase the version of a dependency
+# Make     = Change the build process, tools, or infrastructure
+# Start    = Begin doing something (enable a toggle, feature flag)
+# Stop     = End doing something (disable a toggle, feature flag)
+# Optimize = Improve performance
+# Document = Change documentation
+# Refactor = Restructure code without changing behavior
+# Reformat = Adjust formatting (indentation, spacing)
+# Rephrase = Reword text (comments, docs)
+#
+# Full guide: https://chris.beams.io/git-commit
+########################################################################