diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 75de620e..59747d3c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,6 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           version: latest
-          args: --timeout 30m
 
   prettier-lint:
     runs-on: ubuntu-latest
diff --git a/.golangci.yaml b/.golangci.yaml
index 5a4b9074..9139bba9 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,6 +1,6 @@
 ---
 run:
-  timeout: 5m
+  timeout: 10m
 
 issues:
   skip-dirs:
@@ -23,6 +23,7 @@ linters:
     - exhaustivestruct
     - tagliatelle
     - godox
+    - ireturn
 
     # We should strive to enable these:
     - testpackage
@@ -47,6 +48,8 @@ linters:
     - goconst
     - unconvert
     - exhaustive
+    - varnamelen
+    - nilnil
 
     # We might want to enable this, but it might be a lot of work
     - cyclop