diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index b956f3e5a2..f8ef2cec41 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -102,17 +102,17 @@ rules:
   func-name-matching: error
   func-style: [error, declaration, {allowArrowFunctions: true}]
   # indent: [error, 2, {ArrayExpression: first,
-  #                 CallExpression: {arguments: first},
-  #                 FunctionDeclaration: {parameters: first},
-  #                 FunctionExpression: {parameters: first},
-  #                 MemberExpression: off,
-  #                 ObjectExpression: first,
-  #                 SwitchCase: 1}]
+  #                     CallExpression: {arguments: first},
+  #                     FunctionDeclaration: {parameters: first},
+  #                     FunctionExpression: {parameters: first},
+  #                     MemberExpression: off,
+  #                     ObjectExpression: first,
+  #                     SwitchCase: 1}]
   indent-legacy: [error, 2, {ArrayExpression: first,
-                         CallExpression: {arguments: first},
-                         MemberExpression: 1,
-                         ObjectExpression: first,
-                         SwitchCase: 1}]
+                             CallExpression: {arguments: first},
+                             MemberExpression: 1,
+                             ObjectExpression: first,
+                             SwitchCase: 1}]
   key-spacing: [error, {mode: minimum}]
   keyword-spacing: error
   linebreak-style: [error, unix]
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
index 24f54e6826..1015a5fd25 100644
--- a/lib/.eslintrc.yaml
+++ b/lib/.eslintrc.yaml
@@ -1,4 +1,13 @@
 rules:
+  indent: [error, 2, {ArrayExpression: first,
+                      CallExpression: {arguments: first},
+                      FunctionDeclaration: {parameters: first},
+                      FunctionExpression: {parameters: first},
+                      MemberExpression: off,
+                      ObjectExpression: first,
+                      SwitchCase: 1}]
+  indent-legacy: 0
+
   # Custom rules in tools/eslint-rules
   require-buffer: error
   buffer-constructor: error