diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..6ae7f6ca434381a9992789107311b7ee2a63be5d
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,13 @@
+# Contributed Files
+
+## Commit Template
+
+To install our commit template, use following command (use --global to use it in your global .gitconfig):
+
+    git config [--global] commit.template "~/path_to_leap_platform/contrib/leap-commit-template"
+
+## Signing commits
+
+We very much appreciate signed commits, you can stop forgetting it like this:
+
+    git config [--global] commit.gpgSign
diff --git a/contrib/README.md b/contrib/README.md
deleted file mode 100644
index e836bc7efc69e721ee9a4c838e8a77aa23507193..0000000000000000000000000000000000000000
--- a/contrib/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Contributed Files
-
-## Commit Template
-
-to install this commit template, use following cmd (use --global to use it in your global .gitconfig):
-
-    git config [--global] commit.template "~/path_to_leap_platform/contrib/commit-template.txt"
-
-
diff --git a/contrib/commit-template.txt b/contrib/commit-template.txt
deleted file mode 100644
index 9a1fa81be369b5888549442ba6618dc34102cc07..0000000000000000000000000000000000000000
--- a/contrib/commit-template.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#[bug|feat|docs|style|refactor|test|pkg|i18n]
-
-#- Tested: [local singlenode|local multinode|citest|unstable.bitmask.net]
-#- Resolves: #XYZ
-#- Related: #XYZ
-#- Documentation: #XYZ
-#- Releases: XYZ
diff --git a/contrib/leap-commit-template b/contrib/leap-commit-template
new file mode 100644
index 0000000000000000000000000000000000000000..afc56b2bde98fb03ac400af43ea7b58c632d714a
--- /dev/null
+++ b/contrib/leap-commit-template
@@ -0,0 +1,20 @@
+# Bug|Feat|CI|Docs|Style|Tests|I18n|Vagrant|Lint: [style: https://github.com/m1foley/fit-commit]
+
+
+# [Story about your commit.]
+
+# Use one or more of these things:
+# - Fixes|Closes #3210
+# - Related: #1234
+
+#example:
+#    
+#   Bug: fix apache systemd insanity
+#    
+#   Apache2 systemd autorestart was failing because of #2314432
+#   and it was caused by a gremlin that was entering through a wormhole
+#   caused by #985843, so this commit resolves this wormhole
+#    
+#    # Use one of these things:
+#    [- Fixes|Closes #5234]
+#    [- Related: #1234]