diff --git a/.ansible-lint b/.ansible-lint
index c49cf2af68..1f5a131d8c 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,21 +1,11 @@
 ---
 use_default_rules: true
 skip_list:
-  # [E701] galaxy_info missing in metadata
-  - '701'
-  # [E602] https://github.com/ansible/ansible-lint/issues/457
-  - '602'
   # [E301] Commands should not change things if nothing needs doing
   # TODO(mnasiadka): Fix tasks that fail this check in a later iteration
-  - '301'
+  - no-changed-when
   # [E503] Tasks that run when changed should likely be handlers
-  # TODO(mnasiadka): Rework baremetal role to do handlers instead of when: *.changed
-  - '503'
-  # [E106] Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern
-  - '106'
-  # [E208] permissions not mentioned
-  # FIXME(mnasiadka): Rework file/template to include permissions
-  - '208'
+  - no-handler
   # [unnamed-task] All tasks should be named
   # FIXME(mgoddard): Add names to all tasks
   - unnamed-task