diff --git a/.yamllint.yaml b/.yamllint.yaml
index 97ec306ea3f..c8e63ec7220 100644
--- a/.yamllint.yaml
+++ b/.yamllint.yaml
@@ -1,9 +1,40 @@
 extends: default
 
 rules:
-  document-start:
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+
+  comments-indentation:
+    level: error
+
+  document-end:
     present: false
+
+  document-start:
+    level: error
+    present: false
+
+  empty-lines:
+    max: 1
+
+  indentation:
+    spaces: 2
+
   line-length: disable
+
+  quoted-strings:
+    quote-type: single
+    required: only-when-needed
+
   truthy:
     allowed-values: ['true', 'false', 'on', 'off']