diff --git a/private_dot_config/nvim/snippets/main.snippet b/private_dot_config/nvim/snippets/main.snippet
deleted file mode 100644
index 390d1f2..0000000
--- a/private_dot_config/nvim/snippets/main.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-snippet ftpu "FTP users"
-        - login: ${1:${VISUAL}}
-          password: ${2}
-          path: ${3}
diff --git a/private_dot_config/nvim/snippets/yaml.snippets b/private_dot_config/nvim/snippets/yaml.snippets
new file mode 100644
index 0000000..b10e806
--- /dev/null
+++ b/private_dot_config/nvim/snippets/yaml.snippets
@@ -0,0 +1,36 @@
+snippet ftpu "FTP users"
+        - login: ${1:${VISUAL}}
+          password: ${2}
+          path: ${3}
+snippet BUG "BUG"
+        :BUG:jrabier:`strftime("%Y%m%d")`: ${1}
+snippet DEBUG "DEBUG"
+        :DEBUG:jrabier:`strftime("%Y%m%d")`: ${1}
+snippet WARNING "WARNING"
+        :WARNING:jrabier:`strftime("%Y%m%d")`: ${1}
+snippet TODO "TODO"
+        :TODO:jrabier:`strftime("%Y%m%d")`: ${1}
+snippet COMMENT "COMMENT"
+        :COMMENT:jrabier:`strftime("%Y%m%d")`: ${1}
+snippet DOC "DOC"
+        :DOC:jrabier:`strftime("%Y%m%d")`: ${1}
+snippet EXPIRE "EXPIRE"
+        :EXPIRE:jrabier:`strftime("%Y%m%d")`: ${1}
+
+
+snippet client_contacts "Client contacts"
+        - name: ${1:${VISUAL}}
+            email: ${2}
+            admin: ${3}
+            tech: ${4}
+            hno_phone: ${5}
+            hno_comment: ${6}
+
+snippet local_admins "Local Admins"
+        - name: ${1:${VISUAL}}
+            firstname: ${2}
+            lastname: ${3}
+            shell: /bin/bash
+            password:
+            key: ${4}
+            email: ${5}