diff --git a/.github/workflows/dcm.yml b/.github/workflows/dcm.yml
index b3d77eb0..973772e6 100644
--- a/.github/workflows/dcm.yml
+++ b/.github/workflows/dcm.yml
@@ -16,7 +16,7 @@ jobs:
         uses: CQLabs/setup-dcm@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          version: "1.21.2"
+          version: "1.22.0"
 
       - uses: ./.github/actions/setup
 
diff --git a/mews_pedantic/lib/analysis_options.yaml b/mews_pedantic/lib/analysis_options.yaml
index 75430e13..3ffb0790 100644
--- a/mews_pedantic/lib/analysis_options.yaml
+++ b/mews_pedantic/lib/analysis_options.yaml
@@ -268,6 +268,7 @@ dart_code_metrics:
     - avoid-double-slash-imports
     - avoid-duplicate-cascades
     - avoid-duplicate-collection-elements
+    - avoid-duplicate-constant-values
     - avoid-duplicate-exports
     - avoid-duplicate-initializers
     - avoid-duplicate-map-keys
@@ -287,9 +288,12 @@ dart_code_metrics:
     - avoid-function-type-in-records
     - avoid-future-tostring
     - avoid-generics-shadowing
+    - avoid-getter-prefix:
+        prefix: '^get'
     - avoid-global-state
     # - avoid-identical-exception-handling-blocks
     # - avoid-ignoring-return-values
+    - avoid-implicitly-nullable-extension-types
     # - avoid-importing-entrypoint-exports
     # - avoid-inferrable-type-arguments
     - avoid-inverted-boolean-checks
@@ -321,6 +325,7 @@ dart_code_metrics:
     # - avoid-nested-switch-expressions
     - avoid-nested-switches
     # - avoid-non-ascii-symbols
+    - avoid-non-final-exception-class-fields
     - avoid-non-null-assertion
     - avoid-not-encodable-in-to-json
     - avoid-nullable-interpolation
@@ -352,6 +357,7 @@ dart_code_metrics:
     # - avoid-throw-in-catch-block
     # - avoid-throw-objects-without-tostring
     # - avoid-top-level-members-in-tests
+    - avoid-type-casts
     - avoid-unassigned-late-fields
     - avoid-unassigned-stream-subscriptions
     - avoid-uncaught-future-errors
@@ -360,12 +366,17 @@ dart_code_metrics:
     - avoid-unnecessary-call
     - avoid-unnecessary-collections
     - avoid-unnecessary-conditionals
+    - avoid-unnecessary-constructor
+    - avoid-unnecessary-enum-arguments
+    - avoid-unnecessary-enum-prefix
+    - avoid-unnecessary-extends
     - avoid-unnecessary-futures
     - avoid-unnecessary-getter
     - avoid-unnecessary-if
     - avoid-unnecessary-local-late
     - avoid-unnecessary-negations
     - avoid-unnecessary-nullable-return-type
+    - avoid-unnecessary-overrides
     - avoid-unnecessary-reassignment
     - avoid-unnecessary-return
     - avoid-unnecessary-super
@@ -376,6 +387,7 @@ dart_code_metrics:
     # - avoid-unsafe-collection-methods
     - avoid-unsafe-reduce
     - avoid-unused-after-null-check
+    - avoid-unused-assignment
     - avoid-unused-generics
     # - avoid-unused-instances
     - avoid-unused-parameters
@@ -424,11 +436,12 @@ dart_code_metrics:
     - prefer-any-or-every
     # - prefer-async-await
     - prefer-boolean-prefixes:
-        prefixes: [is, are, was, were, has, have, had, can, should, will, do, does, did, allow, show, use, hide, only, enable]
+        prefixes: [ is, are, was, were, has, have, had, can, should, will, do, does, did, allow, show, use, hide, only, enable ]
     - prefer-both-inlining-annotations
     # - prefer-bytes-builder
     - prefer-commenting-analyzer-ignores
     # - prefer-conditional-expressions
+    - prefer-contains
     # - prefer-correct-callback-field-name
     - prefer-correct-error-name
     - prefer-correct-for-loop-increment
@@ -440,7 +453,7 @@ dart_code_metrics:
     - prefer-correct-stream-return-type
     # - prefer-correct-switch-length
     - prefer-correct-test-file-name:
-        exclude: ["lib/**", "bin/**"]
+        exclude: [ "lib/**", "bin/**" ]
     # - prefer-correct-throws
     # - prefer-correct-type-name
     - prefer-declaring-const-constructor:
@@ -530,6 +543,8 @@ dart_code_metrics:
     # - prefer-using-list-view
     - prefer-widget-private-members:
         ignore-static: true
+    #    - avoid-assigning-to-static-field
+    - avoid-assignments-as-conditions
     - proper-super-calls
     - use-setstate-synchronously
 
@@ -550,6 +565,17 @@ dart_code_metrics:
     - prefer-correct-bloc-provider
     - prefer-multi-bloc-provider
 
+  pubspec-rules:
+  #    - avoid-any-version
+  #    - avoid-dependency-overrides
+  #    - banned-dependencies
+  #    - prefer-caret-version-syntax
+  #    - prefer-correct-package-name
+  #    - prefer-correct-screenshots
+  #    - prefer-pinned-version-syntax
+  #    - prefer-publish-to-none
+  #    - prefer-semver-version
+
   metrics-exclude:
     - lib/**
     - test/**