diff --git a/apis/health_test.go b/apis/health_test.go
index 8633b0e0..1f747d94 100644
--- a/apis/health_test.go
+++ b/apis/health_test.go
@@ -1,9 +1,10 @@
 package apis_test
 
 import (
-	"github.com/pocketbase/pocketbase/tests"
 	"net/http"
 	"testing"
+
+	"github.com/pocketbase/pocketbase/tests"
 )
 
 func TestHealthAPI(t *testing.T) {
diff --git a/daos/base.go b/daos/base.go
index 9c26dda2..a15d7f43 100644
--- a/daos/base.go
+++ b/daos/base.go
@@ -93,9 +93,9 @@ func (dao *Dao) NonconcurrentDB() dbx.Builder {
 // 		}
 // 		defer app.Dao().Continue()
 //
-//  	return app.Dao().RunInTransaction(func (txDao *daos.Dao) error {
-//  	    // some long running read&write transaction...
-//  	})
+// 		return app.Dao().RunInTransaction(func (txDao *daos.Dao) error {
+// 			// some long running read&write transaction...
+// 		})
 // 	}
 func (dao *Dao) Block(ctx context.Context) error {
 	if dao.sem == nil {
diff --git a/golangci.yml b/golangci.yml
index 5ecc1c13..9f3a9f4f 100644
--- a/golangci.yml
+++ b/golangci.yml
@@ -7,10 +7,8 @@ linters:
   disable-all: true
   enable:
     - asciicheck
-    - deadcode
     - depguard
     - exportloopref
-    - gocritic
     - gofmt
     - goimports
     - gomodguard
@@ -26,5 +24,4 @@ linters:
     - typecheck
     - unconvert
     - unused
-    - varcheck
     - whitespace
diff --git a/tools/auth/base_provider.go b/tools/auth/base_provider.go
index 99085b6c..d4e8b645 100644
--- a/tools/auth/base_provider.go
+++ b/tools/auth/base_provider.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"golang.org/x/oauth2"
@@ -125,7 +125,7 @@ func (p *baseProvider) sendRawUserDataRequest(req *http.Request, token *oauth2.T
 	}
 	defer response.Body.Close()
 
-	result, err := ioutil.ReadAll(response.Body)
+	result, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}
diff --git a/tools/auth/github.go b/tools/auth/github.go
index 7e10873a..8935ef69 100644
--- a/tools/auth/github.go
+++ b/tools/auth/github.go
@@ -2,7 +2,7 @@ package auth
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"strconv"
 
 	"golang.org/x/oauth2"
@@ -75,7 +75,7 @@ func (p *Github) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		}
 		defer response.Body.Close()
 
-		content, err := ioutil.ReadAll(response.Body)
+		content, err := io.ReadAll(response.Body)
 		if err != nil {
 			return user, err
 		}
diff --git a/tools/filesystem/file_test.go b/tools/filesystem/file_test.go
index cec13686..d6b45a68 100644
--- a/tools/filesystem/file_test.go
+++ b/tools/filesystem/file_test.go
@@ -45,6 +45,10 @@ func TestNewFileFromFromPath(t *testing.T) {
 
 func TestNewFileFromMultipart(t *testing.T) {
 	formData, mp, err := tests.MockMultipartData(nil, "test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	req := httptest.NewRequest("", "/", formData)
 	req.Header.Set(echo.HeaderContentType, mp.FormDataContentType())
 	req.ParseMultipartForm(32 << 20)
diff --git a/tools/mailer/smtp_test.go b/tools/mailer/smtp_test.go
index ebf1d862..072ae14d 100644
--- a/tools/mailer/smtp_test.go
+++ b/tools/mailer/smtp_test.go
@@ -68,7 +68,7 @@ func TestLoginAuthStart(t *testing.T) {
 		}
 
 		if len(resp) != 0 {
-			t.Fatalf("[%s] Expected emtpy data response, got %v", s.name, resp)
+			t.Fatalf("[%s] Expected empty data response, got %v", s.name, resp)
 		}
 
 		if method != "LOGIN" {