diff --git a/.golangci.yaml b/.golangci.yaml
index f3c82928..0df9a637 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -57,9 +57,14 @@ linters-settings:
       - ok
       - c
       - tt
+      - tx
+      - rx
 
   gocritic:
     disabled-checks:
       - appendAssign
       # TODO(kradalby): Remove this
       - ifElseChain
+
+  nlreturn:
+    block-size: 4