diff --git a/.yamllint b/.yamllint
index 88276760562cb58bb9bc47fa890e8a3df1125b9b..cbd76a63c15d553906ae469438038e783de508a8 100644
--- a/.yamllint
+++ b/.yamllint
@@ -15,7 +15,8 @@ rules:
   commas:
     max-spaces-after: -1
     level: error
-  comments: disable
+  comments:
+    min-spaces-from-content: 1
   comments-indentation: disable
   document-start: disable
   empty-lines:
@@ -26,6 +27,9 @@ rules:
   indentation: disable
   key-duplicates: enable
   line-length: disable
+  octal-values:
+    forbid-implicit-octal: true    # yamllint defaults to false
+    forbid-explicit-octal: true    # yamllint defaults to false
   new-line-at-end-of-file: disable
   new-lines:
     type: unix