diff --git a/.golangci.yml b/.golangci.yml
index f9d06ad471c..aa42ce55263 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,6 +10,9 @@ linters:
     - misspell
     - rowserrcheck
     - errorlint
+    - unconvert
+    - sqlclosecheck
+    - noctx
 linters-settings:
   exhaustive:
     default-signifies-exhaustive: true
@@ -40,9 +43,10 @@ linters-settings:
       - name: error-return
       - name: error-strings
       - name: error-naming
+      - name: exported
       - name: if-return
       - name: increment-decrement
-      # - name: var-naming
+      - name: var-naming
       - name: var-declaration
       - name: package-comments
       - name: range
@@ -61,14 +65,14 @@ linters-settings:
       - name: struct-tag
       # - name: string-format
       - name: string-of-int
-      # - name: range-val-address
+      - name: range-val-address
       - name: range-val-in-closure
       - name: modifies-value-receiver
       - name: modifies-parameter
       - name: identical-branches
       - name: get-return
       # - name: flag-parameter
-      # - name: early-return
+      - name: early-return
       - name: defer
       - name: constant-logical-expr
       # - name: confusing-naming
diff --git a/revive.toml b/revive.toml
deleted file mode 100644
index daa62cd5487..00000000000
--- a/revive.toml
+++ /dev/null
@@ -1,53 +0,0 @@
-ignoreGeneratedHeader = false
-severity = "warning"
-confidence = 0.8
-errorCode = 0
-warningCode = 0
-
-[rule.blank-imports]
-[rule.context-as-argument]
-[rule.context-keys-type]
-[rule.dot-imports]
-[rule.error-return]
-[rule.error-strings]
-[rule.error-naming]
-[rule.exported]
-Disabled = true
-[rule.if-return]
-[rule.increment-decrement]
-[rule.var-naming]
-Disabled = true
-[rule.var-declaration]
-[rule.package-comments]
-[rule.range]
-[rule.receiver-naming]
-[rule.time-naming]
-[rule.unexported-return]
-Disabled = true
-[rule.indent-error-flow]
-[rule.errorf]
-[rule.empty-block]
-[rule.superfluous-else]
-[rule.unused-parameter]
-Disabled = true
-[rule.unreachable-code]
-[rule.redefines-builtin-id]
-[rule.waitgroup-by-value]
-[rule.unconditional-recursion]
-[rule.struct-tag]
-# [rule.string-format]
-[rule.string-of-int]
-# [rule.range-val-address]
-[rule.range-val-in-closure]
-[rule.modifies-value-receiver]
-[rule.modifies-parameter]
-[rule.identical-branches]
-[rule.get-return]
-# [rule.flag-parameter]
-# [rule.early-return]
-[rule.defer]
-[rule.constant-logical-expr]
-# [rule.confusing-naming]
-# [rule.confusing-results]
-[rule.bool-literal-in-expr]
-[rule.atomic]