diff --git a/.golangci.yml b/.golangci.yml
index a0ab98608..e69996197 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -21,7 +21,3 @@ issues:
     - linters:
         - stylecheck
       text: "ST1003:"
-    - linters:
-        - staticcheck
-        - stylecheck
-      text: "ST1005:"
diff --git a/cmd/gen.go b/cmd/gen.go
index 3bcbe226f..c4d33915e 100644
--- a/cmd/gen.go
+++ b/cmd/gen.go
@@ -1,11 +1,11 @@
 package cmd
 
 import (
-	"errors"
 	"os"
 	"os/signal"
 
 	env "github.com/Netflix/go-env"
+	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/supabase/cli/internal/gen/keys"
diff --git a/cmd/root.go b/cmd/root.go
index 7a1fb2164..75c88744c 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"errors"
 	"fmt"
 	"net"
 	"net/url"
@@ -11,6 +10,7 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
+	"github.com/go-errors/errors"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
index dece52bae..71d521a01 100644
--- a/internal/bootstrap/bootstrap.go
+++ b/internal/bootstrap/bootstrap.go
@@ -128,7 +128,7 @@ const (
 	POSTGRES_URL_NON_POOLING      = "POSTGRES_URL_NON_POOLING"
 	POSTGRES_USER                 = "POSTGRES_USER"
 	POSTGRES_HOST                 = "POSTGRES_HOST"
-	POSTGRES_PASSWORD             = "POSTGRES_PASSWORD"
+	POSTGRES_PASSWORD             = "POSTGRES_PASSWORD" //nolint:gosec
 	POSTGRES_DATABASE             = "POSTGRES_DATABASE"
 	NEXT_PUBLIC_SUPABASE_ANON_KEY = "NEXT_PUBLIC_SUPABASE_ANON_KEY"
 	NEXT_PUBLIC_SUPABASE_URL      = "NEXT_PUBLIC_SUPABASE_URL"
diff --git a/internal/migration/up/up.go b/internal/migration/up/up.go
index 53c08dfb4..dabc85e1a 100644
--- a/internal/migration/up/up.go
+++ b/internal/migration/up/up.go
@@ -2,10 +2,10 @@ package up
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"path/filepath"
 
+	"github.com/go-errors/errors"
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"