diff --git a/playbooks/roles/git/templates/gitconfig.j2 b/playbooks/roles/git/templates/gitconfig.j2
index 47dc81f..696be6b 100644
--- a/playbooks/roles/git/templates/gitconfig.j2
+++ b/playbooks/roles/git/templates/gitconfig.j2
@@ -1,3 +1,6 @@
+[alias]
+	scommit = commit --signoff
+
 [commit]
 	gpgsign = true
 
@@ -14,6 +17,12 @@
 [gpg]
 	program = gpg2
 
+[init]
+	defaultBranch = main
+
+[pull]
+	rebase = true
+
 [user]
 	name       = Matej Focko
 	email      = {{ git_email }}