diff --git a/.yamllint b/.yamllint
index 4a9dd9c56bd4e8f184f35c10bb154b1a01151419..5b49a617a57de9c462d47fa087ed879cf270aaab 100644
--- a/.yamllint
+++ b/.yamllint
@@ -2,6 +2,15 @@
 
 extends: default
 
+yaml-files:
+  # defaults
+  - '*.yaml'
+  - '*.yml'
+  - '.yamllint'
+  # match more extensions
+  - '*.yaml.*'
+  - '*.yml.*'
+
 # Ideally, we should have nothing in this ignore section.
 #
 # Please consider removing entries below by fixing them.
@@ -19,6 +28,16 @@ ignore: |
   # Broken on purpose (for testing)
   spec/fixtures/lib/gitlab/metrics/dashboard/broken_yml_syntax.yml
 
+  # Dynamic YAML files have syntax errors sometimes.
+  *.erb
+
+  # Vim temporary files.
+  *.sw[pon]
+
+  # Zipped files (by e.g. asset pipeline)
+  *.gz
+  *.bz2
+
   #### Folders ####
   node_modules/
   tmp/