diff --git a/analysis_options.yaml b/analysis_options.yaml
index fd257300f3..42be8cf901 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -33,16 +33,8 @@ analyzer:
 
 linter:
   rules:
-    # Permanent inclusions: These are optional lints that are not default true.
-    - hash_and_equals
     - iterable_contains_unrelated_type
     - list_remove_unrelated_type
-    - overridden_fields
-    - prefer_function_declarations_over_variables
-    - prefer_initializing_formals
-    - prefer_void_to_null
-    - unnecessary_statements
-    # from pedantic
     - always_declare_return_types
     - prefer_single_quotes
     - sort_child_properties_last
diff --git a/pubspec.yaml b/pubspec.yaml
index b0847e4161..c36cf4962b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,8 @@
 name: angular_workspace
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
+
 dev_dependencies:
-  melos: 3.1.0
+  lints: ^2.1.1
+  melos: ^3.1.0