diff --git a/.golangci.yml b/.golangci.yml
index 3b014888..08f995bf 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -35,9 +35,11 @@ linters-settings:
     local-prefixes: github.com/golangci/golangci-lint
   gocritic:
     enabled-tags:
+      - diagnostic
+      - experimental
+      - opinionated
       - performance
       - style
-      - experimental
     disabled-checks:
       - wrapperFunc
       - dupImport # https://github.com/go-critic/go-critic/issues/845
diff --git a/README.md b/README.md
index 3a34b9f5..47fb0738 100644
--- a/README.md
+++ b/README.md
@@ -919,9 +919,11 @@ linters-settings:
     local-prefixes: github.com/golangci/golangci-lint
   gocritic:
     enabled-tags:
+      - diagnostic
+      - experimental
+      - opinionated
       - performance
       - style
-      - experimental
     disabled-checks:
       - wrapperFunc
       - dupImport # https://github.com/go-critic/go-critic/issues/845