diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f8a17a057..28c758d33 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,7 +76,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
         with:
-          version: v2.4.0
+          version: v2.6.0
 
   api-check-translations:
     runs-on: ubuntu-latest
diff --git a/devenv.lock b/devenv.lock
index d2693f1dd..acbd9c83f 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1757511008,
+        "lastModified": 1761922975,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "241280d58ecd6282b239b259afae9f7ba61c02be",
+        "rev": "c9f0b47815a4895fadac87812de8a4de27e0ace1",
         "type": "github"
       },
       "original": {
@@ -19,10 +19,10 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1761588595,
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -40,10 +40,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1757239681,
+        "lastModified": 1760663237,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -74,10 +74,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755783167,
+        "lastModified": 1761313199,
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "4a880fb247d24fbca57269af672e8f78935b0328",
+        "rev": "d1c30452ebecfc55185ae6d1c983c09da0c274ff",
         "type": "github"
       },
       "original": {
@@ -89,10 +89,10 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1757347588,
+        "lastModified": 1761672384,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
         "type": "github"
       },
       "original": {
diff --git a/magefile.go b/magefile.go
index f768565c1..7bc0c79aa 100644
--- a/magefile.go
+++ b/magefile.go
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 //go:build mage
-// +build mage
 
 package main
 
diff --git a/pkg/models/bulk_task_test.go b/pkg/models/bulk_task_test.go
index ee2bf9630..a457bfd66 100644
--- a/pkg/models/bulk_task_test.go
+++ b/pkg/models/bulk_task_test.go
@@ -88,7 +88,8 @@ func TestBulkTask_Update(t *testing.T) {
 
 		err = bt.Update(s, u)
 		require.Error(t, err)
-		assert.IsType(t, ErrInvalidTaskColumn{}, err)
+		var expectedErr ErrInvalidTaskColumn
+		assert.ErrorAs(t, err, &expectedErr)
 	})
 
 	t.Run("update done_at when bulk marking tasks done", func(t *testing.T) {
@@ -132,6 +133,7 @@ func TestBulkTask_Update(t *testing.T) {
 
 		err := bt.Update(s, u)
 		require.Error(t, err)
-		assert.IsType(t, ErrInvalidTaskColumn{}, err)
+		var expectedErr ErrInvalidTaskColumn
+		assert.ErrorAs(t, err, &expectedErr)
 	})
 }
diff --git a/pkg/modules/auth/openid/openid_test.go b/pkg/modules/auth/openid/openid_test.go
index 8674991b0..e32f84465 100644
--- a/pkg/modules/auth/openid/openid_test.go
+++ b/pkg/modules/auth/openid/openid_test.go
@@ -413,6 +413,7 @@ func TestMergeClaims(t *testing.T) {
 
 		// Verify error is returned for missing email
 		require.Error(t, err)
-		assert.IsType(t, &user.ErrNoOpenIDEmailProvided{}, err)
+		var expectedErr *user.ErrNoOpenIDEmailProvided
+		assert.ErrorAs(t, err, &expectedErr)
 	})
 }
diff --git a/pkg/utils/umask_unix.go b/pkg/utils/umask_unix.go
index bd38ef247..6e1de4b67 100644
--- a/pkg/utils/umask_unix.go
+++ b/pkg/utils/umask_unix.go
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 //go:build !windows
-// +build !windows
 
 package utils
 
diff --git a/pkg/utils/umask_windows.go b/pkg/utils/umask_windows.go
index 7d9361cd4..25bdfbdaa 100644
--- a/pkg/utils/umask_windows.go
+++ b/pkg/utils/umask_windows.go
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 //go:build windows
-// +build windows
 
 package utils
 
diff --git a/tools.go b/tools.go
index 613e004ad..91bc0e331 100644
--- a/tools.go
+++ b/tools.go
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 //go:build tools
-// +build tools
 
 package tools