Repository: supabase/cli
Pull request #2953 (2024-12-07 14:07:29)

chore: bump cli module to v2
## What kind of change does this PR introduce?

tests

## What is the new behavior?

Update module and unit tests for v2.

## Additional context

Add any other context or screenshots.



Patch:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f407815..ce32d176 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,12 +21,13 @@ jobs:
       # Required by: internal/utils/credentials/keyring_test.go
       - uses: t1m0thyj/unlock-keyring@v1
       - run: |
-          go run gotest.tools/gotestsum -- ./... -race -v -count=1 \
-          -coverpkg ./cmd/...,./internal/... -coverprofile=coverage.out
+          go run gotest.tools/gotestsum -- -race -v -count=1 -coverprofile=coverage.out \
+          `go list ./... | grep -Ev 'cmd|docs|examples|pkg/api|tools'`
 
-      - uses: shogo82148/actions-goveralls@v1
+      - uses: coverallsapp/github-action@v2
         with:
-          path-to-profile: coverage.out
+          file: coverage.out
+          format: golang
 
   lint:
     name: Lint
diff --git a/cmd/bans.go b/cmd/bans.go
index 603e2dd4..6f930c04 100644
--- a/cmd/bans.go
+++ b/cmd/bans.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/bans/get"
-	"github.com/supabase/cli/internal/bans/update"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/bans/get"
+	"github.com/supabase/cli/v2/internal/bans/update"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go
index fd9f7491..21d24fb1 100644
--- a/cmd/bootstrap.go
+++ b/cmd/bootstrap.go
@@ -11,8 +11,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/bootstrap"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/bootstrap"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/cmd/branches.go b/cmd/branches.go
index 0248e7f3..dd0897d9 100644
--- a/cmd/branches.go
+++ b/cmd/branches.go
@@ -8,16 +8,16 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/branches/create"
-	"github.com/supabase/cli/internal/branches/delete"
-	"github.com/supabase/cli/internal/branches/disable"
-	"github.com/supabase/cli/internal/branches/get"
-	"github.com/supabase/cli/internal/branches/list"
-	"github.com/supabase/cli/internal/branches/update"
-	"github.com/supabase/cli/internal/gen/keys"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/branches/create"
+	"github.com/supabase/cli/v2/internal/branches/delete"
+	"github.com/supabase/cli/v2/internal/branches/disable"
+	"github.com/supabase/cli/v2/internal/branches/get"
+	"github.com/supabase/cli/v2/internal/branches/list"
+	"github.com/supabase/cli/v2/internal/branches/update"
+	"github.com/supabase/cli/v2/internal/gen/keys"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 var (
diff --git a/cmd/config.go b/cmd/config.go
index 1d0f6073..0b065750 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/config/push"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/config/push"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/db.go b/cmd/db.go
index 2d64edd7..6737f543 100644
--- a/cmd/db.go
+++ b/cmd/db.go
@@ -8,22 +8,22 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/db/branch/create"
-	"github.com/supabase/cli/internal/db/branch/delete"
-	"github.com/supabase/cli/internal/db/branch/list"
-	"github.com/supabase/cli/internal/db/branch/switch_"
-	"github.com/supabase/cli/internal/db/diff"
-	"github.com/supabase/cli/internal/db/dump"
-	"github.com/supabase/cli/internal/db/lint"
-	"github.com/supabase/cli/internal/db/pull"
-	"github.com/supabase/cli/internal/db/push"
-	"github.com/supabase/cli/internal/db/remote/changes"
-	"github.com/supabase/cli/internal/db/remote/commit"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/db/test"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/db/branch/create"
+	"github.com/supabase/cli/v2/internal/db/branch/delete"
+	"github.com/supabase/cli/v2/internal/db/branch/list"
+	"github.com/supabase/cli/v2/internal/db/branch/switch_"
+	"github.com/supabase/cli/v2/internal/db/diff"
+	"github.com/supabase/cli/v2/internal/db/dump"
+	"github.com/supabase/cli/v2/internal/db/lint"
+	"github.com/supabase/cli/v2/internal/db/pull"
+	"github.com/supabase/cli/v2/internal/db/push"
+	"github.com/supabase/cli/v2/internal/db/remote/changes"
+	"github.com/supabase/cli/v2/internal/db/remote/commit"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/db/test"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/domains.go b/cmd/domains.go
index 9ec4a097..cbc9ecb6 100644
--- a/cmd/domains.go
+++ b/cmd/domains.go
@@ -3,12 +3,12 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/hostnames/activate"
-	"github.com/supabase/cli/internal/hostnames/create"
-	"github.com/supabase/cli/internal/hostnames/delete"
-	"github.com/supabase/cli/internal/hostnames/get"
-	"github.com/supabase/cli/internal/hostnames/reverify"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/hostnames/activate"
+	"github.com/supabase/cli/v2/internal/hostnames/create"
+	"github.com/supabase/cli/v2/internal/hostnames/delete"
+	"github.com/supabase/cli/v2/internal/hostnames/get"
+	"github.com/supabase/cli/v2/internal/hostnames/reverify"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/encryption.go b/cmd/encryption.go
index d3b654af..5e93d432 100644
--- a/cmd/encryption.go
+++ b/cmd/encryption.go
@@ -4,9 +4,9 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/encryption/get"
-	"github.com/supabase/cli/internal/encryption/update"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/encryption/get"
+	"github.com/supabase/cli/v2/internal/encryption/update"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/functions.go b/cmd/functions.go
index 36dc47f9..b765a41e 100644
--- a/cmd/functions.go
+++ b/cmd/functions.go
@@ -5,15 +5,15 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/functions/delete"
-	"github.com/supabase/cli/internal/functions/deploy"
-	"github.com/supabase/cli/internal/functions/download"
-	"github.com/supabase/cli/internal/functions/list"
-	new_ "github.com/supabase/cli/internal/functions/new"
-	"github.com/supabase/cli/internal/functions/serve"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/internal/functions/delete"
+	"github.com/supabase/cli/v2/internal/functions/deploy"
+	"github.com/supabase/cli/v2/internal/functions/download"
+	"github.com/supabase/cli/v2/internal/functions/list"
+	new_ "github.com/supabase/cli/v2/internal/functions/new"
+	"github.com/supabase/cli/v2/internal/functions/serve"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 var (
diff --git a/cmd/gen.go b/cmd/gen.go
index 1789e29c..9c6e6612 100644
--- a/cmd/gen.go
+++ b/cmd/gen.go
@@ -8,10 +8,10 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/gen/keys"
-	"github.com/supabase/cli/internal/gen/types"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/gen/keys"
+	"github.com/supabase/cli/v2/internal/gen/types"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/init.go b/cmd/init.go
index a9d2d90a..ed9684c2 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	_init "github.com/supabase/cli/internal/init"
-	"github.com/supabase/cli/internal/utils"
+	_init "github.com/supabase/cli/v2/internal/init"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/cmd/inspect.go b/cmd/inspect.go
index 2b55c387..29b69795 100644
--- a/cmd/inspect.go
+++ b/cmd/inspect.go
@@ -8,30 +8,30 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/inspect/bloat"
-	"github.com/supabase/cli/internal/inspect/blocking"
-	"github.com/supabase/cli/internal/inspect/cache"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/inspect/bloat"
+	"github.com/supabase/cli/v2/internal/inspect/blocking"
+	"github.com/supabase/cli/v2/internal/inspect/cache"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 
-	"github.com/supabase/cli/internal/inspect"
-	"github.com/supabase/cli/internal/inspect/calls"
-	"github.com/supabase/cli/internal/inspect/index_sizes"
-	"github.com/supabase/cli/internal/inspect/index_usage"
-	"github.com/supabase/cli/internal/inspect/locks"
-	"github.com/supabase/cli/internal/inspect/long_running_queries"
-	"github.com/supabase/cli/internal/inspect/outliers"
-	"github.com/supabase/cli/internal/inspect/replication_slots"
-	"github.com/supabase/cli/internal/inspect/role_configs"
-	"github.com/supabase/cli/internal/inspect/role_connections"
-	"github.com/supabase/cli/internal/inspect/seq_scans"
-	"github.com/supabase/cli/internal/inspect/table_index_sizes"
-	"github.com/supabase/cli/internal/inspect/table_record_counts"
-	"github.com/supabase/cli/internal/inspect/table_sizes"
-	"github.com/supabase/cli/internal/inspect/total_index_size"
-	"github.com/supabase/cli/internal/inspect/total_table_sizes"
-	"github.com/supabase/cli/internal/inspect/unused_indexes"
-	"github.com/supabase/cli/internal/inspect/vacuum_stats"
+	"github.com/supabase/cli/v2/internal/inspect"
+	"github.com/supabase/cli/v2/internal/inspect/calls"
+	"github.com/supabase/cli/v2/internal/inspect/index_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/index_usage"
+	"github.com/supabase/cli/v2/internal/inspect/locks"
+	"github.com/supabase/cli/v2/internal/inspect/long_running_queries"
+	"github.com/supabase/cli/v2/internal/inspect/outliers"
+	"github.com/supabase/cli/v2/internal/inspect/replication_slots"
+	"github.com/supabase/cli/v2/internal/inspect/role_configs"
+	"github.com/supabase/cli/v2/internal/inspect/role_connections"
+	"github.com/supabase/cli/v2/internal/inspect/seq_scans"
+	"github.com/supabase/cli/v2/internal/inspect/table_index_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/table_record_counts"
+	"github.com/supabase/cli/v2/internal/inspect/table_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/total_index_size"
+	"github.com/supabase/cli/v2/internal/inspect/total_table_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/unused_indexes"
+	"github.com/supabase/cli/v2/internal/inspect/vacuum_stats"
 )
 
 var (
diff --git a/cmd/link.go b/cmd/link.go
index b1aec1d7..ee947c06 100644
--- a/cmd/link.go
+++ b/cmd/link.go
@@ -7,9 +7,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/link"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/link"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 	"golang.org/x/term"
 )
 
diff --git a/cmd/login.go b/cmd/login.go
index ca9aea66..e186d0d0 100644
--- a/cmd/login.go
+++ b/cmd/login.go
@@ -6,8 +6,8 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/login"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/login"
+	"github.com/supabase/cli/v2/internal/utils"
 	"golang.org/x/term"
 )
 
diff --git a/cmd/logout.go b/cmd/logout.go
index dda3dd4c..52559d20 100644
--- a/cmd/logout.go
+++ b/cmd/logout.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/logout"
+	"github.com/supabase/cli/v2/internal/logout"
 )
 
 var (
diff --git a/cmd/migration.go b/cmd/migration.go
index 30b7716a..1224c665 100644
--- a/cmd/migration.go
+++ b/cmd/migration.go
@@ -8,14 +8,14 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/migration/fetch"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/migration/new"
-	"github.com/supabase/cli/internal/migration/repair"
-	"github.com/supabase/cli/internal/migration/squash"
-	"github.com/supabase/cli/internal/migration/up"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/migration/fetch"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/migration/new"
+	"github.com/supabase/cli/v2/internal/migration/repair"
+	"github.com/supabase/cli/v2/internal/migration/squash"
+	"github.com/supabase/cli/v2/internal/migration/up"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/orgs.go b/cmd/orgs.go
index 5d0750db..ace1cd96 100644
--- a/cmd/orgs.go
+++ b/cmd/orgs.go
@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/orgs/create"
-	"github.com/supabase/cli/internal/orgs/list"
+	"github.com/supabase/cli/v2/internal/orgs/create"
+	"github.com/supabase/cli/v2/internal/orgs/list"
 )
 
 var (
diff --git a/cmd/postgres.go b/cmd/postgres.go
index 1c2e0e12..c1e84ca7 100644
--- a/cmd/postgres.go
+++ b/cmd/postgres.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/postgresConfig/get"
-	"github.com/supabase/cli/internal/postgresConfig/update"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/postgresConfig/get"
+	"github.com/supabase/cli/v2/internal/postgresConfig/update"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/projects.go b/cmd/projects.go
index c119e717..4b214c51 100644
--- a/cmd/projects.go
+++ b/cmd/projects.go
@@ -7,13 +7,13 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/projects/apiKeys"
-	"github.com/supabase/cli/internal/projects/create"
-	"github.com/supabase/cli/internal/projects/delete"
-	"github.com/supabase/cli/internal/projects/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/projects/apiKeys"
+	"github.com/supabase/cli/v2/internal/projects/create"
+	"github.com/supabase/cli/v2/internal/projects/delete"
+	"github.com/supabase/cli/v2/internal/projects/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 	"golang.org/x/term"
 )
 
diff --git a/cmd/restrictions.go b/cmd/restrictions.go
index 4358d613..beb1bbf7 100644
--- a/cmd/restrictions.go
+++ b/cmd/restrictions.go
@@ -2,9 +2,9 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/restrictions/get"
-	"github.com/supabase/cli/internal/restrictions/update"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/restrictions/get"
+	"github.com/supabase/cli/v2/internal/restrictions/update"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/root.go b/cmd/root.go
index 35540a89..8906ef32 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -15,8 +15,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/cmd/secrets.go b/cmd/secrets.go
index df4084e4..f4ee8d09 100644
--- a/cmd/secrets.go
+++ b/cmd/secrets.go
@@ -3,10 +3,10 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/secrets/list"
-	"github.com/supabase/cli/internal/secrets/set"
-	"github.com/supabase/cli/internal/secrets/unset"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/secrets/list"
+	"github.com/supabase/cli/v2/internal/secrets/set"
+	"github.com/supabase/cli/v2/internal/secrets/unset"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/seed.go b/cmd/seed.go
index c36b7074..7cac7c32 100644
--- a/cmd/seed.go
+++ b/cmd/seed.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/seed/buckets"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/seed/buckets"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/services.go b/cmd/services.go
index fe298cb4..2fc80e6b 100644
--- a/cmd/services.go
+++ b/cmd/services.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/services"
+	"github.com/supabase/cli/v2/internal/services"
 )
 
 var (
diff --git a/cmd/snippets.go b/cmd/snippets.go
index f69b232a..848e9b7d 100644
--- a/cmd/snippets.go
+++ b/cmd/snippets.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/snippets/download"
-	"github.com/supabase/cli/internal/snippets/list"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/snippets/download"
+	"github.com/supabase/cli/v2/internal/snippets/list"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/sslEnforcement.go b/cmd/sslEnforcement.go
index 7b44d6dd..3a735148 100644
--- a/cmd/sslEnforcement.go
+++ b/cmd/sslEnforcement.go
@@ -4,9 +4,9 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/ssl_enforcement/get"
-	"github.com/supabase/cli/internal/ssl_enforcement/update"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/ssl_enforcement/get"
+	"github.com/supabase/cli/v2/internal/ssl_enforcement/update"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/sso.go b/cmd/sso.go
index a9b4db7d..8c7f3109 100644
--- a/cmd/sso.go
+++ b/cmd/sso.go
@@ -4,14 +4,14 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/supabase/cli/internal/sso/create"
-	"github.com/supabase/cli/internal/sso/get"
-	"github.com/supabase/cli/internal/sso/info"
-	"github.com/supabase/cli/internal/sso/list"
-	"github.com/supabase/cli/internal/sso/remove"
-	"github.com/supabase/cli/internal/sso/update"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/sso/create"
+	"github.com/supabase/cli/v2/internal/sso/get"
+	"github.com/supabase/cli/v2/internal/sso/info"
+	"github.com/supabase/cli/v2/internal/sso/list"
+	"github.com/supabase/cli/v2/internal/sso/remove"
+	"github.com/supabase/cli/v2/internal/sso/update"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 var (
diff --git a/cmd/start.go b/cmd/start.go
index a7af80e0..bbdf54d0 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/start"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/start"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func validateExcludedContainers(excludedContainers []string) {
diff --git a/cmd/status.go b/cmd/status.go
index 13540bfb..f082a432 100644
--- a/cmd/status.go
+++ b/cmd/status.go
@@ -7,8 +7,8 @@ import (
 	env "github.com/Netflix/go-env"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/status"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/status"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/cmd/stop.go b/cmd/stop.go
index 6a6f4aa5..79765110 100644
--- a/cmd/stop.go
+++ b/cmd/stop.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/stop"
+	"github.com/supabase/cli/v2/internal/stop"
 )
 
 var (
diff --git a/cmd/storage.go b/cmd/storage.go
index 3e6eb8fe..8269baac 100644
--- a/cmd/storage.go
+++ b/cmd/storage.go
@@ -3,12 +3,12 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/storage/cp"
-	"github.com/supabase/cli/internal/storage/ls"
-	"github.com/supabase/cli/internal/storage/mv"
-	"github.com/supabase/cli/internal/storage/rm"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/storage/cp"
+	"github.com/supabase/cli/v2/internal/storage/ls"
+	"github.com/supabase/cli/v2/internal/storage/mv"
+	"github.com/supabase/cli/v2/internal/storage/rm"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var (
diff --git a/cmd/unlink.go b/cmd/unlink.go
index e017e75e..8b0f726f 100644
--- a/cmd/unlink.go
+++ b/cmd/unlink.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/unlink"
+	"github.com/supabase/cli/v2/internal/unlink"
 )
 
 var (
diff --git a/cmd/vanitySubdomains.go b/cmd/vanitySubdomains.go
index dd3608c5..47f3de7b 100644
--- a/cmd/vanitySubdomains.go
+++ b/cmd/vanitySubdomains.go
@@ -3,11 +3,11 @@ package cmd
 import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/internal/vanity_subdomains/activate"
-	"github.com/supabase/cli/internal/vanity_subdomains/check"
-	"github.com/supabase/cli/internal/vanity_subdomains/delete"
-	"github.com/supabase/cli/internal/vanity_subdomains/get"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/vanity_subdomains/activate"
+	"github.com/supabase/cli/v2/internal/vanity_subdomains/check"
+	"github.com/supabase/cli/v2/internal/vanity_subdomains/delete"
+	"github.com/supabase/cli/v2/internal/vanity_subdomains/get"
 )
 
 var (
diff --git a/docs/main.go b/docs/main.go
index bfacba31..c7cacc82 100644
--- a/docs/main.go
+++ b/docs/main.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	cli "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/internal/utils"
+	cli "github.com/supabase/cli/v2/cmd"
+	"github.com/supabase/cli/v2/internal/utils"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/examples/functions-deploy/main.go b/examples/functions-deploy/main.go
index 716ef146..e3f7b046 100644
--- a/examples/functions-deploy/main.go
+++ b/examples/functions-deploy/main.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/function"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/function"
 )
 
 func main() {
diff --git a/examples/migrations-up/main.go b/examples/migrations-up/main.go
index 3ef03242..4ff759e9 100644
--- a/examples/migrations-up/main.go
+++ b/examples/migrations-up/main.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 func main() {
diff --git a/examples/seed-buckets/main.go b/examples/seed-buckets/main.go
index 2c62b108..8cd8f69e 100644
--- a/examples/seed-buckets/main.go
+++ b/examples/seed-buckets/main.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 1c55174b..c33559c9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/supabase/cli
+module github.com/supabase/cli/v2
 
 go 1.23.2
 
@@ -18,7 +18,6 @@ require (
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
 	github.com/getsentry/sentry-go v0.30.0
-	github.com/gin-gonic/gin v1.10.0
 	github.com/go-errors/errors v1.5.1
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/go-xmlfmt/xmlfmt v1.1.3
@@ -35,7 +34,6 @@ require (
 	github.com/jackc/pgtype v1.14.4
 	github.com/jackc/pgx/v4 v4.18.3
 	github.com/joho/godotenv v1.5.1
-	github.com/matoous/go-nanoid/v2 v2.1.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/muesli/reflow v0.3.0
 	github.com/oapi-codegen/runtime v1.1.1
@@ -95,8 +93,6 @@ require (
 	github.com/breml/errchkjson v0.4.0 // indirect
 	github.com/butuzov/ireturn v0.3.0 // indirect
 	github.com/butuzov/mirror v1.2.0 // indirect
-	github.com/bytedance/sonic v1.11.6 // indirect
-	github.com/bytedance/sonic/loader v0.1.1 // indirect
 	github.com/catenacyber/perfsprint v0.7.1 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -106,8 +102,6 @@ require (
 	github.com/chavacava/garif v0.1.0 // indirect
 	github.com/ckaznocha/intrange v0.2.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containers/storage v1.56.0 // indirect
@@ -133,10 +127,8 @@ require (
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
 	github.com/fzipp/gocyclo v0.6.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/getkin/kin-openapi v0.124.0 // indirect
 	github.com/ghostiam/protogetter v0.3.8 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-critic/go-critic v0.11.5 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
@@ -144,9 +136,6 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/go-toolsmith/astcast v1.1.0 // indirect
 	github.com/go-toolsmith/astcopy v1.1.0 // indirect
 	github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -156,7 +145,6 @@ require (
 	github.com/go-toolsmith/typep v1.1.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
@@ -196,13 +184,11 @@ require (
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
 	github.com/jjti/go-spancheck v0.6.2 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julz/importas v0.1.0 // indirect
 	github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/kisielk/errcheck v1.8.0 // indirect
 	github.com/kkHAIKE/contextcheck v1.1.5 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/kulti/thelper v0.6.3 // indirect
@@ -211,7 +197,6 @@ require (
 	github.com/lasiar/canonicalheader v1.1.2 // indirect
 	github.com/ldez/gomoddirectives v0.2.4 // indirect
 	github.com/ldez/tagliatelle v0.5.0 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/leonklingele/grouper v1.1.2 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -234,8 +219,6 @@ require (
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/moricho/tparallel v0.3.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
@@ -298,7 +281,6 @@ require (
 	github.com/timonwong/loggercheck v0.10.1 // indirect
 	github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/ultraware/funlen v0.1.0 // indirect
 	github.com/ultraware/whitespace v0.1.1 // indirect
@@ -331,7 +313,6 @@ require (
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/crypto v0.29.0 // indirect
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
 	golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
diff --git a/go.sum b/go.sum
index 9313587d..29f788f4 100644
--- a/go.sum
+++ b/go.sum
@@ -147,10 +147,6 @@ github.com/butuzov/ireturn v0.3.0/go.mod h1:A09nIiwiqzN/IoVo9ogpa0Hzi9fex1kd9PSD
 github.com/butuzov/mirror v1.2.0 h1:9YVK1qIjNspaqWutSv8gsge2e/Xpq1eqEkslEUHy5cs=
 github.com/butuzov/mirror v1.2.0/go.mod h1:DqZZDtzm42wIAIyHXeN8W/qb1EPlb9Qn/if9icBOpdQ=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
-github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
-github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
-github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/catenacyber/perfsprint v0.7.1 h1:PGW5G/Kxn+YrN04cRAZKC+ZuvlVwolYMrIyyTJ/rMmc=
 github.com/catenacyber/perfsprint v0.7.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50=
 github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg=
@@ -189,10 +185,6 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
-github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
@@ -287,18 +279,12 @@ github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQ
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
 github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
 github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
 github.com/getsentry/sentry-go v0.30.0 h1:lWUwDnY7sKHaVIoZ9wYqRHJ5iEmoc0pqcRqFkosKzBo=
 github.com/getsentry/sentry-go v0.30.0/go.mod h1:WU9B9/1/sHDqeV8T+3VwwbjeR5MSXs/6aqG3mqZrezA=
 github.com/ghostiam/protogetter v0.3.8 h1:LYcXbYvybUyTIxN2Mj9h6rHrDZBDwZloPoKctWrFyJY=
 github.com/ghostiam/protogetter v0.3.8/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
 github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
 github.com/go-critic/go-critic v0.11.5 h1:TkDTOn5v7EEngMxu8KbuFqFR43USaaH8XRJLz1jhVYA=
@@ -331,14 +317,6 @@ github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
-github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -375,8 +353,6 @@ github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUW
 github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
@@ -602,7 +578,6 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
@@ -622,10 +597,6 @@ github.com/kisielk/errcheck v1.8.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkHAIKE/contextcheck v1.1.5 h1:CdnJh63tcDe53vG+RebdpdXJTc9atMgGqdx8LXxiilg=
 github.com/kkHAIKE/contextcheck v1.1.5/go.mod h1:O930cpht4xb1YQpK+1+AgoM3mFsvxr7uyFptcnWTYUA=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -652,8 +623,6 @@ github.com/ldez/gomoddirectives v0.2.4 h1:j3YjBIjEBbqZ0NKtBNzr8rtMHTOrLPeiwTkfUJ
 github.com/ldez/gomoddirectives v0.2.4/go.mod h1:oWu9i62VcQDYp9EQ0ONTfqLNh+mDLWWDO+SO0qSQw5g=
 github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo=
 github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY=
 github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA=
 github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -676,8 +645,6 @@ github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s
 github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE=
 github.com/maratori/testpackage v1.1.1 h1:S58XVV5AD7HADMmD0fNnziNHqKvSdDuEKdPD1rNTU04=
 github.com/maratori/testpackage v1.1.1/go.mod h1:s4gRK/ym6AMrqpOa/kEbQTV4Q4jb7WeLZzVhVVVOQMc=
-github.com/matoous/go-nanoid/v2 v2.1.0 h1:P64+dmq21hhWdtvZfEAofnvJULaRR1Yib0+PnU669bE=
-github.com/matoous/go-nanoid/v2 v2.1.0/go.mod h1:KlbGNQ+FhrUNIHUxZdL63t7tl4LaPkZNpUULS8H4uVM=
 github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 h1:gWg6ZQ4JhDfJPqlo2srm/LN17lpybq15AryXIRcWYLE=
 github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@@ -724,11 +691,9 @@ github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiT
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
@@ -971,8 +936,6 @@ github.com/tomarrell/wrapcheck/v2 v2.9.0 h1:801U2YCAjLhdN8zhZ/7tdjB3EnAoRlJHt/s+
 github.com/tomarrell/wrapcheck/v2 v2.9.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
-github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI=
@@ -1074,9 +1037,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
-golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -1548,8 +1508,6 @@ mvdan.cc/gofumpt v0.7.0 h1:bg91ttqXmi9y2xawvkuMXyvAA/1ZGJqYAEGjXuP0JXU=
 mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo=
 mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U=
 mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/internal/bans/get/get.go b/internal/bans/get/get.go
index a9e52901..f6f63c40 100644
--- a/internal/bans/get/get.go
+++ b/internal/bans/get/get.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/bans/update/update.go b/internal/bans/update/update.go
index dfb31d8c..496f187e 100644
--- a/internal/bans/update/update.go
+++ b/internal/bans/update/update.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func validateIps(ips []string) error {
diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
index 677ef153..aecbdd6e 100644
--- a/internal/bootstrap/bootstrap.go
+++ b/internal/bootstrap/bootstrap.go
@@ -19,18 +19,18 @@ import (
 	"github.com/joho/godotenv"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/db/push"
-	initBlank "github.com/supabase/cli/internal/init"
-	"github.com/supabase/cli/internal/link"
-	"github.com/supabase/cli/internal/login"
-	"github.com/supabase/cli/internal/projects/apiKeys"
-	"github.com/supabase/cli/internal/projects/create"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/internal/utils/tenant"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/queue"
+	"github.com/supabase/cli/v2/internal/db/push"
+	initBlank "github.com/supabase/cli/v2/internal/init"
+	"github.com/supabase/cli/v2/internal/link"
+	"github.com/supabase/cli/v2/internal/login"
+	"github.com/supabase/cli/v2/internal/projects/apiKeys"
+	"github.com/supabase/cli/v2/internal/projects/create"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/utils/tenant"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/queue"
 	"golang.org/x/term"
 )
 
diff --git a/internal/branches/create/create.go b/internal/branches/create/create.go
index bf2931b6..63dbaad6 100644
--- a/internal/branches/create/create.go
+++ b/internal/branches/create/create.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/gen/keys"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/gen/keys"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, body api.CreateBranchBody, fsys afero.Fs) error {
diff --git a/internal/branches/delete/delete.go b/internal/branches/delete/delete.go
index b7fdd667..568fd56c 100644
--- a/internal/branches/delete/delete.go
+++ b/internal/branches/delete/delete.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, branchId string) error {
diff --git a/internal/branches/disable/disable.go b/internal/branches/disable/disable.go
index d94c1e6c..b7d54f29 100644
--- a/internal/branches/disable/disable.go
+++ b/internal/branches/disable/disable.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 func Run(ctx context.Context, fsys afero.Fs) error {
diff --git a/internal/branches/get/get.go b/internal/branches/get/get.go
index ee5bc332..19f04a58 100644
--- a/internal/branches/get/get.go
+++ b/internal/branches/get/get.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, branchId string) error {
diff --git a/internal/branches/list/list.go b/internal/branches/list/list.go
index 7a153138..d40b3824 100644
--- a/internal/branches/list/list.go
+++ b/internal/branches/list/list.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
 )
 
 func Run(ctx context.Context, fsys afero.Fs) error {
diff --git a/internal/branches/update/update.go b/internal/branches/update/update.go
index 6c0f5fc4..2ddb03f1 100644
--- a/internal/branches/update/update.go
+++ b/internal/branches/update/update.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, branchId string, body api.UpdateBranchBody, fsys afero.Fs) error {
diff --git a/internal/config/push/push.go b/internal/config/push/push.go
index a4c90147..5ddc9070 100644
--- a/internal/config/push/push.go
+++ b/internal/config/push/push.go
@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 func Run(ctx context.Context, ref string, fsys afero.Fs) error {
diff --git a/internal/db/branch/create/create.go b/internal/db/branch/create/create.go
index 085e10f9..66635bad 100644
--- a/internal/db/branch/create/create.go
+++ b/internal/db/branch/create/create.go
@@ -13,7 +13,7 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/internal/db/branch/delete/delete.go b/internal/db/branch/delete/delete.go
index f59f5e51..9655cd79 100644
--- a/internal/db/branch/delete/delete.go
+++ b/internal/db/branch/delete/delete.go
@@ -11,7 +11,7 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(branch string, fsys afero.Fs) error {
diff --git a/internal/db/branch/list/list.go b/internal/db/branch/list/list.go
index b1037ac1..f8810422 100644
--- a/internal/db/branch/list/list.go
+++ b/internal/db/branch/list/list.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(fsys afero.Fs, out io.Writer) error {
diff --git a/internal/db/branch/switch_/switch_.go b/internal/db/branch/switch_/switch_.go
index 462b26c6..b1255ea6 100644
--- a/internal/db/branch/switch_/switch_.go
+++ b/internal/db/branch/switch_/switch_.go
@@ -10,8 +10,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, target string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/db/diff/diff.go b/internal/db/diff/diff.go
index 6c5faa89..05da6045 100644
--- a/internal/db/diff/diff.go
+++ b/internal/db/diff/diff.go
@@ -21,11 +21,11 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/gen/keys"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/parser"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/gen/keys"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/parser"
 )
 
 type DiffFunc func(context.Context, string, string, []string) (string, error)
diff --git a/internal/db/diff/migra.go b/internal/db/diff/migra.go
index 4e784269..47f8ba1b 100644
--- a/internal/db/diff/migra.go
+++ b/internal/db/diff/migra.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 //go:embed templates/migra.sh
diff --git a/internal/db/diff/pgadmin.go b/internal/db/diff/pgadmin.go
index 29802358..baa98484 100644
--- a/internal/db/diff/pgadmin.go
+++ b/internal/db/diff/pgadmin.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/migration/new"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/migration/new"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 var warnDiff = `WARNING: The diff tool is not foolproof, so you may need to manually rearrange and modify the generated migration.
diff --git a/internal/db/dump/dump.go b/internal/db/dump/dump.go
index 94e2ba7a..bef685fe 100644
--- a/internal/db/dump/dump.go
+++ b/internal/db/dump/dump.go
@@ -13,8 +13,8 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	cliConfig "github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/utils"
+	cliConfig "github.com/supabase/cli/v2/pkg/config"
 )
 
 var (
diff --git a/internal/db/lint/lint.go b/internal/db/lint/lint.go
index 5701d89b..5fe21d18 100644
--- a/internal/db/lint/lint.go
+++ b/internal/db/lint/lint.go
@@ -13,8 +13,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 const ENABLE_PGSQL_CHECK = "CREATE EXTENSION IF NOT EXISTS plpgsql_check"
diff --git a/internal/db/pull/pull.go b/internal/db/pull/pull.go
index f6a235e1..ad5e0710 100644
--- a/internal/db/pull/pull.go
+++ b/internal/db/pull/pull.go
@@ -12,13 +12,13 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/diff"
-	"github.com/supabase/cli/internal/db/dump"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/migration/new"
-	"github.com/supabase/cli/internal/migration/repair"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/db/diff"
+	"github.com/supabase/cli/v2/internal/db/dump"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/migration/new"
+	"github.com/supabase/cli/v2/internal/migration/repair"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 var (
diff --git a/internal/db/push/push.go b/internal/db/push/push.go
index 2141255a..29555b5b 100644
--- a/internal/db/push/push.go
+++ b/internal/db/push/push.go
@@ -10,10 +10,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/up"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/migration/up"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, dryRun, ignoreVersionMismatch bool, includeRoles, includeSeed bool, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/db/remote/changes/changes.go b/internal/db/remote/changes/changes.go
index c735b598..c711470c 100644
--- a/internal/db/remote/changes/changes.go
+++ b/internal/db/remote/changes/changes.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/diff"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/db/diff"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 var output string
diff --git a/internal/db/remote/commit/commit.go b/internal/db/remote/commit/commit.go
index f9062d49..75b9232d 100644
--- a/internal/db/remote/commit/commit.go
+++ b/internal/db/remote/commit/commit.go
@@ -10,12 +10,12 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/diff"
-	"github.com/supabase/cli/internal/db/dump"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/migration/repair"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/db/diff"
+	"github.com/supabase/cli/v2/internal/db/dump"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/migration/repair"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, schema []string, config pgconn.Config, fsys afero.Fs) error {
diff --git a/internal/db/reset/reset.go b/internal/db/reset/reset.go
index 3830a019..81b8e145 100644
--- a/internal/db/reset/reset.go
+++ b/internal/db/reset/reset.go
@@ -20,15 +20,15 @@ import (
 	"github.com/jackc/pgerrcode"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/gen/keys"
-	"github.com/supabase/cli/internal/migration/apply"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/migration/repair"
-	"github.com/supabase/cli/internal/seed/buckets"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/gen/keys"
+	"github.com/supabase/cli/v2/internal/migration/apply"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/migration/repair"
+	"github.com/supabase/cli/v2/internal/seed/buckets"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, version string, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/db/start/start.go b/internal/db/start/start.go
index c4722f22..f286b1fc 100644
--- a/internal/db/start/start.go
+++ b/internal/db/start/start.go
@@ -19,10 +19,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/apply"
-	"github.com/supabase/cli/internal/status"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/migration/apply"
+	"github.com/supabase/cli/v2/internal/status"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 var (
diff --git a/internal/encryption/get/get.go b/internal/encryption/get/get.go
index 93c69863..22b82786 100644
--- a/internal/encryption/get/get.go
+++ b/internal/encryption/get/get.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string) error {
diff --git a/internal/encryption/update/update.go b/internal/encryption/update/update.go
index ed576823..172c6429 100644
--- a/internal/encryption/update/update.go
+++ b/internal/encryption/update/update.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, stdin *os.File) error {
diff --git a/internal/functions/delete/delete.go b/internal/functions/delete/delete.go
index 47d5957e..0242d5a7 100644
--- a/internal/functions/delete/delete.go
+++ b/internal/functions/delete/delete.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, slug string, projectRef string, fsys afero.Fs) error {
diff --git a/internal/functions/deploy/bundle.go b/internal/functions/deploy/bundle.go
index 0119a559..4a75e82e 100644
--- a/internal/functions/deploy/bundle.go
+++ b/internal/functions/deploy/bundle.go
@@ -13,8 +13,8 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/function"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/function"
 )
 
 type dockerBundler struct {
diff --git a/internal/functions/deploy/deploy.go b/internal/functions/deploy/deploy.go
index 529b7897..2c97931c 100644
--- a/internal/functions/deploy/deploy.go
+++ b/internal/functions/deploy/deploy.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/function"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/function"
 )
 
 func Run(ctx context.Context, slugs []string, projectRef string, noVerifyJWT *bool, importMapPath string, fsys afero.Fs) error {
diff --git a/internal/functions/download/download.go b/internal/functions/download/download.go
index e3b68cae..169df9d8 100644
--- a/internal/functions/download/download.go
+++ b/internal/functions/download/download.go
@@ -15,8 +15,8 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 var (
diff --git a/internal/functions/list/list.go b/internal/functions/list/list.go
index d0d2d9ec..603de90a 100644
--- a/internal/functions/list/list.go
+++ b/internal/functions/list/list.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/functions/new/new.go b/internal/functions/new/new.go
index 3656e9b5..d876a991 100644
--- a/internal/functions/new/new.go
+++ b/internal/functions/new/new.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/internal/functions/serve/serve.go b/internal/functions/serve/serve.go
index 62811d76..1d9b2825 100644
--- a/internal/functions/serve/serve.go
+++ b/internal/functions/serve/serve.go
@@ -16,9 +16,9 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/functions/deploy"
-	"github.com/supabase/cli/internal/secrets/set"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/functions/deploy"
+	"github.com/supabase/cli/v2/internal/secrets/set"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 type InspectMode string
diff --git a/internal/gen/keys/keys.go b/internal/gen/keys/keys.go
index 81ed5298..a1079e62 100644
--- a/internal/gen/keys/keys.go
+++ b/internal/gen/keys/keys.go
@@ -11,8 +11,8 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/go-git/go-git/v5"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 type CustomName struct {
diff --git a/internal/gen/types/types.go b/internal/gen/types/types.go
index b399cfb5..1e158dd1 100644
--- a/internal/gen/types/types.go
+++ b/internal/gen/types/types.go
@@ -12,8 +12,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 const (
diff --git a/internal/hostnames/activate/activate.go b/internal/hostnames/activate/activate.go
index 3cc01c20..1b951085 100644
--- a/internal/hostnames/activate/activate.go
+++ b/internal/hostnames/activate/activate.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/hostnames"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/hostnames"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, includeRawOutput bool, fsys afero.Fs) error {
diff --git a/internal/hostnames/common.go b/internal/hostnames/common.go
index c01e6a0d..b1f55e24 100644
--- a/internal/hostnames/common.go
+++ b/internal/hostnames/common.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func GetCustomHostnameConfig(ctx context.Context, projectRef string) (*api.V1GetHostnameConfigResponse, error) {
diff --git a/internal/hostnames/create/create.go b/internal/hostnames/create/create.go
index 563b524b..4f3e7c3e 100644
--- a/internal/hostnames/create/create.go
+++ b/internal/hostnames/create/create.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/hostnames"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/hostnames"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, customHostname string, includeRawOutput bool, fsys afero.Fs) error {
diff --git a/internal/hostnames/delete/delete.go b/internal/hostnames/delete/delete.go
index 3b9f3653..6e472bc6 100644
--- a/internal/hostnames/delete/delete.go
+++ b/internal/hostnames/delete/delete.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/hostnames/get/get.go b/internal/hostnames/get/get.go
index 9e17c19f..def0af73 100644
--- a/internal/hostnames/get/get.go
+++ b/internal/hostnames/get/get.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/hostnames"
+	"github.com/supabase/cli/v2/internal/hostnames"
 )
 
 func Run(ctx context.Context, projectRef string, includeRawOutput bool, fsys afero.Fs) error {
diff --git a/internal/hostnames/reverify/reverify.go b/internal/hostnames/reverify/reverify.go
index 7f432990..c7abe821 100644
--- a/internal/hostnames/reverify/reverify.go
+++ b/internal/hostnames/reverify/reverify.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/hostnames"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/hostnames"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, includeRawOutput bool, fsys afero.Fs) error {
diff --git a/internal/init/init.go b/internal/init/init.go
index f4e470b0..ed99ecb9 100644
--- a/internal/init/init.go
+++ b/internal/init/init.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/internal/inspect/bloat/bloat.go b/internal/inspect/bloat/bloat.go
index 6a97e41c..ed680d00 100644
--- a/internal/inspect/bloat/bloat.go
+++ b/internal/inspect/bloat/bloat.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed bloat.sql
diff --git a/internal/inspect/blocking/blocking.go b/internal/inspect/blocking/blocking.go
index 37baed1f..9aa6baba 100644
--- a/internal/inspect/blocking/blocking.go
+++ b/internal/inspect/blocking/blocking.go
@@ -10,9 +10,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed blocking.sql
diff --git a/internal/inspect/cache/cache.go b/internal/inspect/cache/cache.go
index ce30c1f4..c36339a6 100644
--- a/internal/inspect/cache/cache.go
+++ b/internal/inspect/cache/cache.go
@@ -9,9 +9,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed cache.sql
diff --git a/internal/inspect/calls/calls.go b/internal/inspect/calls/calls.go
index 2fd0c8df..a1fe4d9e 100644
--- a/internal/inspect/calls/calls.go
+++ b/internal/inspect/calls/calls.go
@@ -10,9 +10,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed calls.sql
diff --git a/internal/inspect/index_sizes/index_sizes.go b/internal/inspect/index_sizes/index_sizes.go
index 2cfc06e8..56467f38 100644
--- a/internal/inspect/index_sizes/index_sizes.go
+++ b/internal/inspect/index_sizes/index_sizes.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed index_sizes.sql
diff --git a/internal/inspect/index_usage/index_usage.go b/internal/inspect/index_usage/index_usage.go
index cd8875f7..76019e5c 100644
--- a/internal/inspect/index_usage/index_usage.go
+++ b/internal/inspect/index_usage/index_usage.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed index_usage.sql
diff --git a/internal/inspect/locks/locks.go b/internal/inspect/locks/locks.go
index 0b2db71c..57aa8ed6 100644
--- a/internal/inspect/locks/locks.go
+++ b/internal/inspect/locks/locks.go
@@ -10,9 +10,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed locks.sql
diff --git a/internal/inspect/long_running_queries/long_running_queries.go b/internal/inspect/long_running_queries/long_running_queries.go
index acf4be45..31b0095a 100644
--- a/internal/inspect/long_running_queries/long_running_queries.go
+++ b/internal/inspect/long_running_queries/long_running_queries.go
@@ -9,9 +9,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed long_running_queries.sql
diff --git a/internal/inspect/outliers/outliers.go b/internal/inspect/outliers/outliers.go
index 06f015c1..2e5c849d 100644
--- a/internal/inspect/outliers/outliers.go
+++ b/internal/inspect/outliers/outliers.go
@@ -10,9 +10,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed outliers.sql
diff --git a/internal/inspect/replication_slots/replication_slots.go b/internal/inspect/replication_slots/replication_slots.go
index 927ad052..e0ef52ee 100644
--- a/internal/inspect/replication_slots/replication_slots.go
+++ b/internal/inspect/replication_slots/replication_slots.go
@@ -9,9 +9,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed replication_slots.sql
diff --git a/internal/inspect/report.go b/internal/inspect/report.go
index de721d95..718ea534 100644
--- a/internal/inspect/report.go
+++ b/internal/inspect/report.go
@@ -14,8 +14,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 //go:embed **/*.sql
diff --git a/internal/inspect/role_configs/role_configs.go b/internal/inspect/role_configs/role_configs.go
index f4fb7938..9f605419 100644
--- a/internal/inspect/role_configs/role_configs.go
+++ b/internal/inspect/role_configs/role_configs.go
@@ -9,9 +9,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed role_configs.sql
diff --git a/internal/inspect/role_connections/role_connections.go b/internal/inspect/role_connections/role_connections.go
index 5b0a5653..e5bec093 100644
--- a/internal/inspect/role_connections/role_connections.go
+++ b/internal/inspect/role_connections/role_connections.go
@@ -9,9 +9,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed role_connections.sql
diff --git a/internal/inspect/seq_scans/seq_scans.go b/internal/inspect/seq_scans/seq_scans.go
index 6b52538e..240112d5 100644
--- a/internal/inspect/seq_scans/seq_scans.go
+++ b/internal/inspect/seq_scans/seq_scans.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed seq_scans.sql
diff --git a/internal/inspect/table_index_sizes/table_index_sizes.go b/internal/inspect/table_index_sizes/table_index_sizes.go
index e61f2336..8a5b3a09 100644
--- a/internal/inspect/table_index_sizes/table_index_sizes.go
+++ b/internal/inspect/table_index_sizes/table_index_sizes.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed table_index_sizes.sql
diff --git a/internal/inspect/table_record_counts/table_record_counts.go b/internal/inspect/table_record_counts/table_record_counts.go
index e0b39437..19e32a5b 100644
--- a/internal/inspect/table_record_counts/table_record_counts.go
+++ b/internal/inspect/table_record_counts/table_record_counts.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed table_record_counts.sql
diff --git a/internal/inspect/table_sizes/table_sizes.go b/internal/inspect/table_sizes/table_sizes.go
index 7741f011..7ce49e22 100644
--- a/internal/inspect/table_sizes/table_sizes.go
+++ b/internal/inspect/table_sizes/table_sizes.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed table_sizes.sql
diff --git a/internal/inspect/total_index_size/total_index_size.go b/internal/inspect/total_index_size/total_index_size.go
index fbc66b25..bd6a13fd 100644
--- a/internal/inspect/total_index_size/total_index_size.go
+++ b/internal/inspect/total_index_size/total_index_size.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed total_index_size.sql
diff --git a/internal/inspect/total_table_sizes/total_table_sizes.go b/internal/inspect/total_table_sizes/total_table_sizes.go
index 80b1c89a..3b96dcad 100644
--- a/internal/inspect/total_table_sizes/total_table_sizes.go
+++ b/internal/inspect/total_table_sizes/total_table_sizes.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed total_table_sizes.sql
diff --git a/internal/inspect/unused_indexes/unused_indexes.go b/internal/inspect/unused_indexes/unused_indexes.go
index 2a30a46d..d7589888 100644
--- a/internal/inspect/unused_indexes/unused_indexes.go
+++ b/internal/inspect/unused_indexes/unused_indexes.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed unused_indexes.sql
diff --git a/internal/inspect/vacuum_stats/vacuum_stats.go b/internal/inspect/vacuum_stats/vacuum_stats.go
index dc9326d7..95095650 100644
--- a/internal/inspect/vacuum_stats/vacuum_stats.go
+++ b/internal/inspect/vacuum_stats/vacuum_stats.go
@@ -10,10 +10,10 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 //go:embed vacuum_stats.sql
diff --git a/internal/link/link.go b/internal/link/link.go
index e791271b..5f156b11 100644
--- a/internal/link/link.go
+++ b/internal/link/link.go
@@ -13,15 +13,15 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/internal/utils/tenant"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	cliConfig "github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/diff"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/utils/tenant"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	cliConfig "github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/diff"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/login/login.go b/internal/login/login.go
index 6239b500..be1265be 100644
--- a/internal/login/login.go
+++ b/internal/login/login.go
@@ -20,9 +20,9 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/google/uuid"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/new"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/internal/migration/new"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 type RunParams struct {
diff --git a/internal/logout/logout.go b/internal/logout/logout.go
index abbd191b..ae71bf00 100644
--- a/internal/logout/logout.go
+++ b/internal/logout/logout.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 )
 
 func Run(ctx context.Context, stdout *os.File, fsys afero.Fs) error {
diff --git a/internal/migration/apply/apply.go b/internal/migration/apply/apply.go
index 224b342f..ea7f6cb8 100644
--- a/internal/migration/apply/apply.go
+++ b/internal/migration/apply/apply.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func MigrateAndSeed(ctx context.Context, version string, conn *pgx.Conn, fsys afero.Fs) error {
diff --git a/internal/migration/fetch/fetch.go b/internal/migration/fetch/fetch.go
index cb78c70d..fac52578 100644
--- a/internal/migration/fetch/fetch.go
+++ b/internal/migration/fetch/fetch.go
@@ -10,8 +10,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/migration/list/list.go b/internal/migration/list/list.go
index 3107d4ec..d1202d06 100644
--- a/internal/migration/list/list.go
+++ b/internal/migration/list/list.go
@@ -11,8 +11,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/migration/new/new.go b/internal/migration/new/new.go
index be232b59..026c54c7 100644
--- a/internal/migration/new/new.go
+++ b/internal/migration/new/new.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(migrationName string, stdin afero.File, fsys afero.Fs) error {
diff --git a/internal/migration/repair/repair.go b/internal/migration/repair/repair.go
index c0670000..b43779aa 100644
--- a/internal/migration/repair/repair.go
+++ b/internal/migration/repair/repair.go
@@ -11,9 +11,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 const (
diff --git a/internal/migration/squash/squash.go b/internal/migration/squash/squash.go
index 2ed9e625..64429d26 100644
--- a/internal/migration/squash/squash.go
+++ b/internal/migration/squash/squash.go
@@ -14,13 +14,13 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/diff"
-	"github.com/supabase/cli/internal/db/dump"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/migration/repair"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/db/diff"
+	"github.com/supabase/cli/v2/internal/db/dump"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/migration/repair"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 var ErrMissingVersion = errors.New("version not found")
diff --git a/internal/migration/up/up.go b/internal/migration/up/up.go
index d33117f3..8229fd6e 100644
--- a/internal/migration/up/up.go
+++ b/internal/migration/up/up.go
@@ -9,8 +9,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
 )
 
 func Run(ctx context.Context, includeAll bool, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
diff --git a/internal/orgs/create/create.go b/internal/orgs/create/create.go
index ed6008ab..df7c1eec 100644
--- a/internal/orgs/create/create.go
+++ b/internal/orgs/create/create.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, name string) error {
diff --git a/internal/orgs/list/list.go b/internal/orgs/list/list.go
index abd6c08d..4eb7487f 100644
--- a/internal/orgs/list/list.go
+++ b/internal/orgs/list/list.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context) error {
diff --git a/internal/postgresConfig/get/get.go b/internal/postgresConfig/get/get.go
index ad311b39..535f0f17 100644
--- a/internal/postgresConfig/get/get.go
+++ b/internal/postgresConfig/get/get.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/postgresConfig/update/update.go b/internal/postgresConfig/update/update.go
index 94632d48..9c8bec82 100644
--- a/internal/postgresConfig/update/update.go
+++ b/internal/postgresConfig/update/update.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/postgresConfig/get"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/postgresConfig/get"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, values []string, replaceOverrides, noRestart bool, fsys afero.Fs) error {
diff --git a/internal/projects/apiKeys/api_keys.go b/internal/projects/apiKeys/api_keys.go
index 7daddce2..be5035a5 100644
--- a/internal/projects/apiKeys/api_keys.go
+++ b/internal/projects/apiKeys/api_keys.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/projects/create/create.go b/internal/projects/create/create.go
index ddbd46b4..671020f1 100644
--- a/internal/projects/create/create.go
+++ b/internal/projects/create/create.go
@@ -9,10 +9,10 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, params api.V1CreateProjectBodyDto, fsys afero.Fs) error {
diff --git a/internal/projects/delete/delete.go b/internal/projects/delete/delete.go
index f042f62e..dda1dd29 100644
--- a/internal/projects/delete/delete.go
+++ b/internal/projects/delete/delete.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/unlink"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/unlink"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/projects/list/list.go b/internal/projects/list/list.go
index ef356dfc..23dae8f0 100644
--- a/internal/projects/list/list.go
+++ b/internal/projects/list/list.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 type linkedProject struct {
diff --git a/internal/restrictions/get/get.go b/internal/restrictions/get/get.go
index f8e27342..ffd4d8fb 100644
--- a/internal/restrictions/get/get.go
+++ b/internal/restrictions/get/get.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string) error {
diff --git a/internal/restrictions/update/update.go b/internal/restrictions/update/update.go
index 98a70da9..8b5718a7 100644
--- a/internal/restrictions/update/update.go
+++ b/internal/restrictions/update/update.go
@@ -6,8 +6,8 @@ import (
 	"net"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, dbCidrsToAllow []string, bypassCidrChecks bool) error {
diff --git a/internal/secrets/list/list.go b/internal/secrets/list/list.go
index e5b4d453..9cf4efa6 100644
--- a/internal/secrets/list/list.go
+++ b/internal/secrets/list/list.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/secrets/set/set.go b/internal/secrets/set/set.go
index d2877c31..14e715c7 100644
--- a/internal/secrets/set/set.go
+++ b/internal/secrets/set/set.go
@@ -12,8 +12,8 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/joho/godotenv"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef, envFilePath string, args []string, fsys afero.Fs) error {
diff --git a/internal/secrets/unset/unset.go b/internal/secrets/unset/unset.go
index f6bbca8c..e9f680d1 100644
--- a/internal/secrets/unset/unset.go
+++ b/internal/secrets/unset/unset.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/secrets/list"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/secrets/list"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, args []string, fsys afero.Fs) error {
diff --git a/internal/seed/buckets/buckets.go b/internal/seed/buckets/buckets.go
index b460fdc7..f6834482 100644
--- a/internal/seed/buckets/buckets.go
+++ b/internal/seed/buckets/buckets.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, interactive bool, fsys afero.Fs) error {
diff --git a/internal/services/services.go b/internal/services/services.go
index ebc08efc..e32a3ad5 100644
--- a/internal/services/services.go
+++ b/internal/services/services.go
@@ -9,10 +9,10 @@ import (
 	"sync"
 
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/internal/utils/tenant"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/internal/utils/tenant"
 )
 
 func Run(ctx context.Context, fsys afero.Fs) error {
diff --git a/internal/snippets/download/download.go b/internal/snippets/download/download.go
index 7f1f3a46..f983d210 100644
--- a/internal/snippets/download/download.go
+++ b/internal/snippets/download/download.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, snippetId string, fsys afero.Fs) error {
diff --git a/internal/snippets/list/list.go b/internal/snippets/list/list.go
index f54325ea..c3c651f7 100644
--- a/internal/snippets/list/list.go
+++ b/internal/snippets/list/list.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, fsys afero.Fs) error {
diff --git a/internal/ssl_enforcement/get/get.go b/internal/ssl_enforcement/get/get.go
index e6d58693..50673d9c 100644
--- a/internal/ssl_enforcement/get/get.go
+++ b/internal/ssl_enforcement/get/get.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/ssl_enforcement/update/update.go b/internal/ssl_enforcement/update/update.go
index 51b0b672..f5805d10 100644
--- a/internal/ssl_enforcement/update/update.go
+++ b/internal/ssl_enforcement/update/update.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, enforceDbSsl bool, fsys afero.Fs) error {
diff --git a/internal/sso/create/create.go b/internal/sso/create/create.go
index a33b6e7e..1b24e12a 100644
--- a/internal/sso/create/create.go
+++ b/internal/sso/create/create.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/sso/internal/render"
-	"github.com/supabase/cli/internal/sso/internal/saml"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/sso/internal/render"
+	"github.com/supabase/cli/v2/internal/sso/internal/saml"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 var Fs = afero.NewOsFs()
diff --git a/internal/sso/get/get.go b/internal/sso/get/get.go
index 34370523..43a8e206 100644
--- a/internal/sso/get/get.go
+++ b/internal/sso/get/get.go
@@ -7,9 +7,9 @@ import (
 	"os"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/sso/internal/render"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/sso/internal/render"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, ref, providerId, format string) error {
diff --git a/internal/sso/info/info.go b/internal/sso/info/info.go
index c8a25805..ffe51b8b 100644
--- a/internal/sso/info/info.go
+++ b/internal/sso/info/info.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/supabase/cli/internal/sso/internal/render"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/sso/internal/render"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, ref string, format string) error {
diff --git a/internal/sso/internal/render/render.go b/internal/sso/internal/render/render.go
index 3f3a03db..3e45b2e0 100644
--- a/internal/sso/internal/render/render.go
+++ b/internal/sso/internal/render/render.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/go-xmlfmt/xmlfmt"
-	"github.com/supabase/cli/internal/migration/list"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/migration/list"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func formatProtocol(provider api.Provider) string {
diff --git a/internal/sso/internal/saml/files.go b/internal/sso/internal/saml/files.go
index 62e0846e..3b47dbe9 100644
--- a/internal/sso/internal/saml/files.go
+++ b/internal/sso/internal/saml/files.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 var DefaultClient = http.DefaultClient
diff --git a/internal/sso/list/list.go b/internal/sso/list/list.go
index efacb1a0..181a86af 100644
--- a/internal/sso/list/list.go
+++ b/internal/sso/list/list.go
@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/sso/internal/render"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/sso/internal/render"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, ref, format string) error {
diff --git a/internal/sso/remove/remove.go b/internal/sso/remove/remove.go
index 1514314d..a8b5b1cc 100644
--- a/internal/sso/remove/remove.go
+++ b/internal/sso/remove/remove.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/sso/internal/render"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/sso/internal/render"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, ref, providerId, format string) error {
diff --git a/internal/sso/update/update.go b/internal/sso/update/update.go
index e8a745dc..5a412fed 100644
--- a/internal/sso/update/update.go
+++ b/internal/sso/update/update.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/sso/internal/render"
-	"github.com/supabase/cli/internal/sso/internal/saml"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/sso/internal/render"
+	"github.com/supabase/cli/v2/internal/sso/internal/saml"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 var Fs = afero.NewOsFs()
diff --git a/internal/start/start.go b/internal/start/start.go
index 4315d31b..c74f6287 100644
--- a/internal/start/start.go
+++ b/internal/start/start.go
@@ -23,14 +23,14 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/functions/serve"
-	"github.com/supabase/cli/internal/seed/buckets"
-	"github.com/supabase/cli/internal/services"
-	"github.com/supabase/cli/internal/status"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/functions/serve"
+	"github.com/supabase/cli/v2/internal/seed/buckets"
+	"github.com/supabase/cli/v2/internal/services"
+	"github.com/supabase/cli/v2/internal/status"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/config"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/internal/status/status.go b/internal/status/status.go
index 1b9d02f9..bcd8ff8b 100644
--- a/internal/status/status.go
+++ b/internal/status/status.go
@@ -18,8 +18,8 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 type CustomName struct {
diff --git a/internal/stop/stop.go b/internal/stop/stop.go
index 39c5e00e..fc9dfebd 100644
--- a/internal/stop/stop.go
+++ b/internal/stop/stop.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/docker/docker/api/types/volume"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, backup bool, projectId string, all bool, fsys afero.Fs) error {
diff --git a/internal/storage/client/api.go b/internal/storage/client/api.go
index c8c2a02e..ea44f3c7 100644
--- a/internal/storage/client/api.go
+++ b/internal/storage/client/api.go
@@ -5,11 +5,11 @@ import (
 	"net/http"
 
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/status"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/tenant"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/status"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/tenant"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 func NewStorageAPI(ctx context.Context, projectRef string) (storage.StorageAPI, error) {
diff --git a/internal/storage/cp/cp.go b/internal/storage/cp/cp.go
index e55120a1..6c5df9f3 100644
--- a/internal/storage/cp/cp.go
+++ b/internal/storage/cp/cp.go
@@ -12,12 +12,12 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/storage/ls"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/queue"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/storage/ls"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/queue"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var errUnsupportedOperation = errors.New("Unsupported operation")
diff --git a/internal/storage/ls/ls.go b/internal/storage/ls/ls.go
index 396dc9b7..0f521ce9 100644
--- a/internal/storage/ls/ls.go
+++ b/internal/storage/ls/ls.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 func Run(ctx context.Context, objectPath string, recursive bool, fsys afero.Fs) error {
diff --git a/internal/storage/mv/mv.go b/internal/storage/mv/mv.go
index a6dc8773..91f0ef3b 100644
--- a/internal/storage/mv/mv.go
+++ b/internal/storage/mv/mv.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/storage/ls"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/storage/ls"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var (
diff --git a/internal/storage/rm/rm.go b/internal/storage/rm/rm.go
index 720bbce0..8734cc8c 100644
--- a/internal/storage/rm/rm.go
+++ b/internal/storage/rm/rm.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/storage/cp"
-	"github.com/supabase/cli/internal/storage/ls"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/storage/cp"
+	"github.com/supabase/cli/v2/internal/storage/ls"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var (
diff --git a/internal/unlink/unlink.go b/internal/unlink/unlink.go
index b59f4d1f..5750f647 100644
--- a/internal/unlink/unlink.go
+++ b/internal/unlink/unlink.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/utils/access_token.go b/internal/utils/access_token.go
index f7ef90a0..bd48823c 100644
--- a/internal/utils/access_token.go
+++ b/internal/utils/access_token.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/utils/api.go b/internal/utils/api.go
index 32b199b6..271d8ceb 100644
--- a/internal/utils/api.go
+++ b/internal/utils/api.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils/cloudflare"
-	supabase "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/internal/utils/cloudflare"
+	supabase "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 const (
diff --git a/internal/utils/cloudflare/api.go b/internal/utils/cloudflare/api.go
index 7c7cf10a..eeadef03 100644
--- a/internal/utils/cloudflare/api.go
+++ b/internal/utils/cloudflare/api.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 type CloudflareAPI struct {
diff --git a/internal/utils/cloudflare/dns.go b/internal/utils/cloudflare/dns.go
index f8a06367..739968ef 100644
--- a/internal/utils/cloudflare/dns.go
+++ b/internal/utils/cloudflare/dns.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/google/go-querystring/query"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 type DNSType uint16
diff --git a/internal/utils/config.go b/internal/utils/config.go
index 3f89dc75..13af5cd3 100644
--- a/internal/utils/config.go
+++ b/internal/utils/config.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 var (
diff --git a/internal/utils/connect.go b/internal/utils/connect.go
index 9479d4e4..c4f20df5 100644
--- a/internal/utils/connect.go
+++ b/internal/utils/connect.go
@@ -13,8 +13,8 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/debug"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/internal/debug"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 func ToPostgresURL(config pgconn.Config) string {
diff --git a/internal/utils/console.go b/internal/utils/console.go
index 85bebdc1..54c36b96 100644
--- a/internal/utils/console.go
+++ b/internal/utils/console.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/cast"
 	"golang.org/x/term"
 )
 
diff --git a/internal/utils/flags/db_url.go b/internal/utils/flags/db_url.go
index 013453b8..a08c6f0b 100644
--- a/internal/utils/flags/db_url.go
+++ b/internal/utils/flags/db_url.go
@@ -12,9 +12,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 type connection int
diff --git a/internal/utils/flags/project_ref.go b/internal/utils/flags/project_ref.go
index 73df7235..6b39b02a 100644
--- a/internal/utils/flags/project_ref.go
+++ b/internal/utils/flags/project_ref.go
@@ -6,10 +6,11 @@ import (
 	"fmt"
 	"os"
 
+	tea "github.com/charmbracelet/bubbletea"
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 	"golang.org/x/term"
 )
 
@@ -26,7 +27,7 @@ func ParseProjectRef(ctx context.Context, fsys afero.Fs) error {
 	return errors.New(utils.ErrNotLinked)
 }
 
-func PromptProjectRef(ctx context.Context, title string) error {
+func PromptProjectRef(ctx context.Context, title string, opts ...tea.ProgramOption) error {
 	resp, err := utils.GetSupabase().V1ListAllProjectsWithResponse(ctx)
 	if err != nil {
 		return errors.Errorf("failed to retrieve projects: %w", err)
@@ -41,7 +42,7 @@ func PromptProjectRef(ctx context.Context, title string) error {
 			Details: fmt.Sprintf("name: %s, org: %s, region: %s", project.Name, project.OrganizationId, project.Region),
 		}
 	}
-	choice, err := utils.PromptChoice(ctx, title, items)
+	choice, err := utils.PromptChoice(ctx, title, items, opts...)
 	if err != nil {
 		return err
 	}
diff --git a/internal/utils/prompt.go b/internal/utils/prompt.go
index 8ff67d97..5589f49d 100644
--- a/internal/utils/prompt.go
+++ b/internal/utils/prompt.go
@@ -103,7 +103,7 @@ func (m model) View() string {
 }
 
 // Prompt user to choose from a list of items, returns the chosen index.
-func PromptChoice(ctx context.Context, title string, items []PromptItem) (PromptItem, error) {
+func PromptChoice(ctx context.Context, title string, items []PromptItem, opts ...tea.ProgramOption) (PromptItem, error) {
 	// Create list items
 	var listItems []list.Item
 	for _, v := range items {
@@ -126,7 +126,7 @@ func PromptChoice(ctx context.Context, title string, items []PromptItem) (Prompt
 	// Create our model
 	ctx, cancel := context.WithCancel(ctx)
 	initial := model{cancel: cancel, list: l}
-	prog := tea.NewProgram(initial)
+	prog := tea.NewProgram(initial, opts...)
 	state, err := prog.Run()
 	if err != nil {
 		return initial.choice, errors.Errorf("failed to prompt choice: %w", err)
diff --git a/internal/utils/tenant/client.go b/internal/utils/tenant/client.go
index ad0ef6aa..f932a531 100644
--- a/internal/utils/tenant/client.go
+++ b/internal/utils/tenant/client.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 var (
diff --git a/internal/utils/tenant/database.go b/internal/utils/tenant/database.go
index 1ae1ee6a..4f733e29 100644
--- a/internal/utils/tenant/database.go
+++ b/internal/utils/tenant/database.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var errDatabaseVersion = errors.New("Database version not found.")
diff --git a/internal/utils/tenant/gotrue.go b/internal/utils/tenant/gotrue.go
index 507a63af..64269b27 100644
--- a/internal/utils/tenant/gotrue.go
+++ b/internal/utils/tenant/gotrue.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 var errGotrueVersion = errors.New("GoTrue version not found.")
diff --git a/internal/utils/tenant/postgrest.go b/internal/utils/tenant/postgrest.go
index cb8c96d2..00293b4c 100644
--- a/internal/utils/tenant/postgrest.go
+++ b/internal/utils/tenant/postgrest.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 var errPostgrestVersion = errors.New("PostgREST version not found.")
diff --git a/internal/vanity_subdomains/activate/activate.go b/internal/vanity_subdomains/activate/activate.go
index 133ec7ed..2a968d88 100644
--- a/internal/vanity_subdomains/activate/activate.go
+++ b/internal/vanity_subdomains/activate/activate.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, desiredSubdomain string, fsys afero.Fs) error {
diff --git a/internal/vanity_subdomains/check/check.go b/internal/vanity_subdomains/check/check.go
index 39012270..6a8bf9dd 100644
--- a/internal/vanity_subdomains/check/check.go
+++ b/internal/vanity_subdomains/check/check.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func Run(ctx context.Context, projectRef string, desiredSubdomain string, fsys afero.Fs) error {
diff --git a/internal/vanity_subdomains/delete/delete.go b/internal/vanity_subdomains/delete/delete.go
index 3ee24d47..592e2880 100644
--- a/internal/vanity_subdomains/delete/delete.go
+++ b/internal/vanity_subdomains/delete/delete.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/internal/vanity_subdomains/get/get.go b/internal/vanity_subdomains/get/get.go
index b466f189..450b54f4 100644
--- a/internal/vanity_subdomains/get/get.go
+++ b/internal/vanity_subdomains/get/get.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func Run(ctx context.Context, projectRef string, fsys afero.Fs) error {
diff --git a/main.go b/main.go
index 9b54f5ec..be8d4dc8 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/supabase/cli/cmd"
+	"github.com/supabase/cli/v2/cmd"
 )
 
 //go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=pkg/api/types.cfg.yaml api/beta.yaml
diff --git a/pkg/config/api.go b/pkg/config/api.go
index ec7c4f86..509e61e5 100644
--- a/pkg/config/api.go
+++ b/pkg/config/api.go
@@ -3,9 +3,9 @@ package config
 import (
 	"strings"
 
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/diff"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/diff"
 )
 
 type (
diff --git a/pkg/config/auth.go b/pkg/config/auth.go
index 5cb551cd..c02923df 100644
--- a/pkg/config/auth.go
+++ b/pkg/config/auth.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/diff"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/diff"
 )
 
 type PasswordRequirements string
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 938016e8..425e02c1 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -30,8 +30,8 @@ import (
 	"github.com/joho/godotenv"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/pkg/config/db.go b/pkg/config/db.go
index 2a1d31ca..e0817658 100644
--- a/pkg/config/db.go
+++ b/pkg/config/db.go
@@ -3,9 +3,9 @@ package config
 import (
 	"bytes"
 
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/diff"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/diff"
 )
 
 type PoolMode string
diff --git a/pkg/config/storage.go b/pkg/config/storage.go
index b11b28a1..b5690789 100644
--- a/pkg/config/storage.go
+++ b/pkg/config/storage.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/diff"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/diff"
 )
 
 type (
diff --git a/pkg/config/updater.go b/pkg/config/updater.go
index 445000d0..7a6d08d0 100644
--- a/pkg/config/updater.go
+++ b/pkg/config/updater.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/go-errors/errors"
-	v1API "github.com/supabase/cli/pkg/api"
+	v1API "github.com/supabase/cli/v2/pkg/api"
 )
 
 type ConfigUpdater struct {
diff --git a/pkg/function/api.go b/pkg/function/api.go
index e3f641de..622786dc 100644
--- a/pkg/function/api.go
+++ b/pkg/function/api.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 type EdgeRuntimeAPI struct {
diff --git a/pkg/function/batch.go b/pkg/function/batch.go
index 43f837fc..0b61375c 100644
--- a/pkg/function/batch.go
+++ b/pkg/function/batch.go
@@ -12,8 +12,8 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/docker/go-units"
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 const (
diff --git a/pkg/migration/drop.go b/pkg/migration/drop.go
index 362f2a9d..68677ac2 100644
--- a/pkg/migration/drop.go
+++ b/pkg/migration/drop.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/jackc/pgx/v4"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 var (
diff --git a/pkg/migration/file.go b/pkg/migration/file.go
index 79da1c86..d0bed5ad 100644
--- a/pkg/migration/file.go
+++ b/pkg/migration/file.go
@@ -14,7 +14,7 @@ import (
 	"github.com/jackc/pgtype"
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/pkg/parser"
+	"github.com/supabase/cli/v2/pkg/parser"
 )
 
 type MigrationFile struct {
diff --git a/pkg/migration/history.go b/pkg/migration/history.go
index 2ca14167..3e6f8a36 100644
--- a/pkg/migration/history.go
+++ b/pkg/migration/history.go
@@ -6,7 +6,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 const (
diff --git a/pkg/migration/list.go b/pkg/migration/list.go
index ec8bf2ac..dfe9837b 100644
--- a/pkg/migration/list.go
+++ b/pkg/migration/list.go
@@ -13,7 +13,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgerrcode"
 	"github.com/jackc/pgx/v4"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 )
 
 func ListRemoteMigrations(ctx context.Context, conn *pgx.Conn) ([]string, error) {
diff --git a/pkg/parser/token.go b/pkg/parser/token.go
index db008434..b939ae6c 100644
--- a/pkg/parser/token.go
+++ b/pkg/parser/token.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 // Equal to `startBufSize` from `bufio/scan.go`
diff --git a/pkg/storage/api.go b/pkg/storage/api.go
index e7765eb9..3904b52e 100644
--- a/pkg/storage/api.go
+++ b/pkg/storage/api.go
@@ -1,6 +1,6 @@
 package storage
 
-import "github.com/supabase/cli/pkg/fetcher"
+import "github.com/supabase/cli/v2/pkg/fetcher"
 
 type StorageAPI struct {
 	*fetcher.Fetcher
diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go
index 8a681242..dc54515b 100644
--- a/pkg/storage/batch.go
+++ b/pkg/storage/batch.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 
 	"github.com/go-errors/errors"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/queue"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/queue"
 )
 
 func (s *StorageAPI) UpsertBuckets(ctx context.Context, bucketConfig config.BucketConfig, filter ...func(string) bool) error {
diff --git a/pkg/storage/buckets.go b/pkg/storage/buckets.go
index 1f4bf9cc..b2d4fc25 100644
--- a/pkg/storage/buckets.go
+++ b/pkg/storage/buckets.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 type BucketResponse struct {
diff --git a/pkg/storage/objects.go b/pkg/storage/objects.go
index f048cecf..3a5633cf 100644
--- a/pkg/storage/objects.go
+++ b/pkg/storage/objects.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 type ListObjectsQuery struct {
diff --git a/tools/bumpdoc/main.go b/tools/bumpdoc/main.go
index 55d9de34..10a86772 100644
--- a/tools/bumpdoc/main.go
+++ b/tools/bumpdoc/main.go
@@ -12,8 +12,8 @@ import (
 	"regexp"
 
 	"github.com/google/go-github/v62/github"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/tools/shared"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/tools/shared"
 )
 
 const (
diff --git a/tools/changelog/main.go b/tools/changelog/main.go
index 97b587ed..84ce70ec 100644
--- a/tools/changelog/main.go
+++ b/tools/changelog/main.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/google/go-github/v62/github"
 	"github.com/slack-go/slack"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func main() {
diff --git a/tools/listdep/main.go b/tools/listdep/main.go
index bf3c8898..6d28db52 100644
--- a/tools/listdep/main.go
+++ b/tools/listdep/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 func main() {
diff --git a/tools/publish/main.go b/tools/publish/main.go
index be2474ed..c9944a29 100644
--- a/tools/publish/main.go
+++ b/tools/publish/main.go
@@ -16,9 +16,9 @@ import (
 	"text/template"
 
 	"github.com/google/go-github/v62/github"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/tools/shared"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/tools/shared"
 )
 
 const (
diff --git a/tools/selfhost/main.go b/tools/selfhost/main.go
index cb9ada3a..145c5380 100644
--- a/tools/selfhost/main.go
+++ b/tools/selfhost/main.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 
 	"github.com/google/go-github/v62/github"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/tools/shared"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/tools/shared"
 	"gopkg.in/yaml.v3"
 )
 


Test patch:
diff --git a/cmd/test.go b/cmd/test.go
index 06fb7773..91ac6def 100644
--- a/cmd/test.go
+++ b/cmd/test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/supabase/cli/internal/test/new"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/test/new"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var (
diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go
index 6cf6eb6e..8dd89d46 100644
--- a/internal/bootstrap/bootstrap_test.go
+++ b/internal/bootstrap/bootstrap_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestSuggestAppStart(t *testing.T) {
diff --git a/internal/branches/create/create_test.go b/internal/branches/create/create_test.go
index e07e1038..d58ed55a 100644
--- a/internal/branches/create/create_test.go
+++ b/internal/branches/create/create_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func TestCreateCommand(t *testing.T) {
diff --git a/internal/db/branch/create/create_test.go b/internal/db/branch/create/create_test.go
index 8e384234..20bfd4ac 100644
--- a/internal/db/branch/create/create_test.go
+++ b/internal/db/branch/create/create_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestBranchValidation(t *testing.T) {
diff --git a/internal/db/branch/delete/delete_test.go b/internal/db/branch/delete/delete_test.go
index 76957e24..709a3a52 100644
--- a/internal/db/branch/delete/delete_test.go
+++ b/internal/db/branch/delete/delete_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestBranchDir(t *testing.T) {
diff --git a/internal/db/branch/list/list_test.go b/internal/db/branch/list/list_test.go
index 24e34d5e..fa16586a 100644
--- a/internal/db/branch/list/list_test.go
+++ b/internal/db/branch/list/list_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestListCommand(t *testing.T) {
diff --git a/internal/db/branch/switch_/switch__test.go b/internal/db/branch/switch_/switch__test.go
index 7c70959c..8f22f321 100644
--- a/internal/db/branch/switch_/switch__test.go
+++ b/internal/db/branch/switch_/switch__test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestSwitchCommand(t *testing.T) {
diff --git a/internal/db/diff/diff_test.go b/internal/db/diff/diff_test.go
index 6ada103c..3db4d954 100644
--- a/internal/db/diff/diff_test.go
+++ b/internal/db/diff/diff_test.go
@@ -17,14 +17,14 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/db/dump/dump_test.go b/internal/db/dump/dump_test.go
index 3a7c3cc6..62c1240a 100644
--- a/internal/db/dump/dump_test.go
+++ b/internal/db/dump/dump_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/db/lint/lint_test.go b/internal/db/lint/lint_test.go
index 8d7abef8..807540a4 100644
--- a/internal/db/lint/lint_test.go
+++ b/internal/db/lint/lint_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/db/pull/pull_test.go b/internal/db/pull/pull_test.go
index 2e55fcfe..f6248fe9 100644
--- a/internal/db/pull/pull_test.go
+++ b/internal/db/pull/pull_test.go
@@ -13,11 +13,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/db/push/push_test.go b/internal/db/push/push_test.go
index 3a3ff3cd..dad8f2e4 100644
--- a/internal/db/push/push_test.go
+++ b/internal/db/push/push_test.go
@@ -13,11 +13,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/db/reset/reset_test.go b/internal/db/reset/reset_test.go
index 4e3558be..3693ac8b 100644
--- a/internal/db/reset/reset_test.go
+++ b/internal/db/reset/reset_test.go
@@ -16,14 +16,14 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 func TestResetCommand(t *testing.T) {
diff --git a/internal/db/start/start_test.go b/internal/db/start/start_test.go
index 475562f2..e52ecbbb 100644
--- a/internal/db/start/start_test.go
+++ b/internal/db/start/start_test.go
@@ -14,11 +14,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestInitBranch(t *testing.T) {
diff --git a/internal/db/test/test.go b/internal/db/test/test.go
index 26330573..4374e7c9 100644
--- a/internal/db/test/test.go
+++ b/internal/db/test/test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	cliConfig "github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/utils"
+	cliConfig "github.com/supabase/cli/v2/pkg/config"
 )
 
 const (
diff --git a/internal/db/test/test_test.go b/internal/db/test/test_test.go
index 7c931099..30f781fd 100644
--- a/internal/db/test/test_test.go
+++ b/internal/db/test/test_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/debug/postgres_test.go b/internal/debug/postgres_test.go
index 9f46fd6b..4d836ce7 100644
--- a/internal/debug/postgres_test.go
+++ b/internal/debug/postgres_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestPostgresProxy(t *testing.T) {
diff --git a/internal/encryption/get/get_test.go b/internal/encryption/get/get_test.go
index 8f280189..a3656dc0 100644
--- a/internal/encryption/get/get_test.go
+++ b/internal/encryption/get/get_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestGetRootKey(t *testing.T) {
diff --git a/internal/encryption/update/update_test.go b/internal/encryption/update/update_test.go
index 8a6f6093..5e8bf343 100644
--- a/internal/encryption/update/update_test.go
+++ b/internal/encryption/update/update_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestUpdateRootKey(t *testing.T) {
diff --git a/internal/functions/delete/delete_test.go b/internal/functions/delete/delete_test.go
index 110208ea..ac39d5ce 100644
--- a/internal/functions/delete/delete_test.go
+++ b/internal/functions/delete/delete_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestDeleteCommand(t *testing.T) {
diff --git a/internal/functions/deploy/bundle_test.go b/internal/functions/deploy/bundle_test.go
index f8a68f43..bb286cc2 100644
--- a/internal/functions/deploy/bundle_test.go
+++ b/internal/functions/deploy/bundle_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestDockerBundle(t *testing.T) {
diff --git a/internal/functions/deploy/deploy_test.go b/internal/functions/deploy/deploy_test.go
index 558a33f3..542094f1 100644
--- a/internal/functions/deploy/deploy_test.go
+++ b/internal/functions/deploy/deploy_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 func TestDeployCommand(t *testing.T) {
diff --git a/internal/functions/download/download_test.go b/internal/functions/download/download_test.go
index b727f95c..73c8afd8 100644
--- a/internal/functions/download/download_test.go
+++ b/internal/functions/download/download_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestMain(m *testing.M) {
diff --git a/internal/functions/list/list_test.go b/internal/functions/list/list_test.go
index e9c7f26b..8f9d2617 100644
--- a/internal/functions/list/list_test.go
+++ b/internal/functions/list/list_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestFunctionsListCommand(t *testing.T) {
diff --git a/internal/functions/new/new_test.go b/internal/functions/new/new_test.go
index d5e9c2fc..fbb5f5e2 100644
--- a/internal/functions/new/new_test.go
+++ b/internal/functions/new/new_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestNewCommand(t *testing.T) {
diff --git a/internal/functions/serve/serve_test.go b/internal/functions/serve/serve_test.go
index 570c4b92..dbc14852 100644
--- a/internal/functions/serve/serve_test.go
+++ b/internal/functions/serve/serve_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func TestServeCommand(t *testing.T) {
diff --git a/internal/gen/types/types_test.go b/internal/gen/types/types_test.go
index 811ae061..07ed9e02 100644
--- a/internal/gen/types/types_test.go
+++ b/internal/gen/types/types_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestGenLocalCommand(t *testing.T) {
diff --git a/internal/init/init_test.go b/internal/init/init_test.go
index 99a96dce..b47c2f0f 100644
--- a/internal/init/init_test.go
+++ b/internal/init/init_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func TestInitCommand(t *testing.T) {
diff --git a/internal/inspect/bloat/bloat_test.go b/internal/inspect/bloat/bloat_test.go
index 8646565c..e5b75d79 100644
--- a/internal/inspect/bloat/bloat_test.go
+++ b/internal/inspect/bloat/bloat_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/blocking/blocking_test.go b/internal/inspect/blocking/blocking_test.go
index 46b63441..15bd6971 100644
--- a/internal/inspect/blocking/blocking_test.go
+++ b/internal/inspect/blocking/blocking_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/cache/cache_test.go b/internal/inspect/cache/cache_test.go
index 28fa1cb7..cc332c85 100644
--- a/internal/inspect/cache/cache_test.go
+++ b/internal/inspect/cache/cache_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/calls/calls_test.go b/internal/inspect/calls/calls_test.go
index ded27100..3d5a8408 100644
--- a/internal/inspect/calls/calls_test.go
+++ b/internal/inspect/calls/calls_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/index_sizes/index_sizes_test.go b/internal/inspect/index_sizes/index_sizes_test.go
index 9071c571..fe3cf71e 100644
--- a/internal/inspect/index_sizes/index_sizes_test.go
+++ b/internal/inspect/index_sizes/index_sizes_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/index_usage/index_usage_test.go b/internal/inspect/index_usage/index_usage_test.go
index 5b735bb6..be965bf3 100644
--- a/internal/inspect/index_usage/index_usage_test.go
+++ b/internal/inspect/index_usage/index_usage_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/locks/locks_test.go b/internal/inspect/locks/locks_test.go
index e4c55c6b..398c9dce 100644
--- a/internal/inspect/locks/locks_test.go
+++ b/internal/inspect/locks/locks_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/long_running_queries/long_running_queries_test.go b/internal/inspect/long_running_queries/long_running_queries_test.go
index d936c61a..afb2e249 100644
--- a/internal/inspect/long_running_queries/long_running_queries_test.go
+++ b/internal/inspect/long_running_queries/long_running_queries_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/outliers/outliers_test.go b/internal/inspect/outliers/outliers_test.go
index e5d46432..f6f83cf3 100644
--- a/internal/inspect/outliers/outliers_test.go
+++ b/internal/inspect/outliers/outliers_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/replication_slots/replication_slots_test.go b/internal/inspect/replication_slots/replication_slots_test.go
index d9e9b322..a7891b4c 100644
--- a/internal/inspect/replication_slots/replication_slots_test.go
+++ b/internal/inspect/replication_slots/replication_slots_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/report_test.go b/internal/inspect/report_test.go
index 6b422045..898734c6 100644
--- a/internal/inspect/report_test.go
+++ b/internal/inspect/report_test.go
@@ -8,27 +8,27 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/inspect/bloat"
-	"github.com/supabase/cli/internal/inspect/blocking"
-	"github.com/supabase/cli/internal/inspect/cache"
-	"github.com/supabase/cli/internal/inspect/calls"
-	"github.com/supabase/cli/internal/inspect/index_sizes"
-	"github.com/supabase/cli/internal/inspect/index_usage"
-	"github.com/supabase/cli/internal/inspect/locks"
-	"github.com/supabase/cli/internal/inspect/long_running_queries"
-	"github.com/supabase/cli/internal/inspect/outliers"
-	"github.com/supabase/cli/internal/inspect/replication_slots"
-	"github.com/supabase/cli/internal/inspect/role_configs"
-	"github.com/supabase/cli/internal/inspect/role_connections"
-	"github.com/supabase/cli/internal/inspect/seq_scans"
-	"github.com/supabase/cli/internal/inspect/table_index_sizes"
-	"github.com/supabase/cli/internal/inspect/table_record_counts"
-	"github.com/supabase/cli/internal/inspect/table_sizes"
-	"github.com/supabase/cli/internal/inspect/total_index_size"
-	"github.com/supabase/cli/internal/inspect/total_table_sizes"
-	"github.com/supabase/cli/internal/inspect/unused_indexes"
-	"github.com/supabase/cli/internal/inspect/vacuum_stats"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/inspect/bloat"
+	"github.com/supabase/cli/v2/internal/inspect/blocking"
+	"github.com/supabase/cli/v2/internal/inspect/cache"
+	"github.com/supabase/cli/v2/internal/inspect/calls"
+	"github.com/supabase/cli/v2/internal/inspect/index_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/index_usage"
+	"github.com/supabase/cli/v2/internal/inspect/locks"
+	"github.com/supabase/cli/v2/internal/inspect/long_running_queries"
+	"github.com/supabase/cli/v2/internal/inspect/outliers"
+	"github.com/supabase/cli/v2/internal/inspect/replication_slots"
+	"github.com/supabase/cli/v2/internal/inspect/role_configs"
+	"github.com/supabase/cli/v2/internal/inspect/role_connections"
+	"github.com/supabase/cli/v2/internal/inspect/seq_scans"
+	"github.com/supabase/cli/v2/internal/inspect/table_index_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/table_record_counts"
+	"github.com/supabase/cli/v2/internal/inspect/table_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/total_index_size"
+	"github.com/supabase/cli/v2/internal/inspect/total_table_sizes"
+	"github.com/supabase/cli/v2/internal/inspect/unused_indexes"
+	"github.com/supabase/cli/v2/internal/inspect/vacuum_stats"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/role_configs/role_configs_test.go b/internal/inspect/role_configs/role_configs_test.go
index 554a1252..67d73430 100644
--- a/internal/inspect/role_configs/role_configs_test.go
+++ b/internal/inspect/role_configs/role_configs_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/role_connections/role_connections_test.go b/internal/inspect/role_connections/role_connections_test.go
index 32ecab76..b7d1ec88 100644
--- a/internal/inspect/role_connections/role_connections_test.go
+++ b/internal/inspect/role_connections/role_connections_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/seq_scans/seq_scans_test.go b/internal/inspect/seq_scans/seq_scans_test.go
index 3db6caee..0e2bdfb4 100644
--- a/internal/inspect/seq_scans/seq_scans_test.go
+++ b/internal/inspect/seq_scans/seq_scans_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/table_index_sizes/table_index_sizes_test.go b/internal/inspect/table_index_sizes/table_index_sizes_test.go
index 20ad80fc..92e58ef5 100644
--- a/internal/inspect/table_index_sizes/table_index_sizes_test.go
+++ b/internal/inspect/table_index_sizes/table_index_sizes_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/table_record_counts/table_record_counts_test.go b/internal/inspect/table_record_counts/table_record_counts_test.go
index a03714d9..753074e7 100644
--- a/internal/inspect/table_record_counts/table_record_counts_test.go
+++ b/internal/inspect/table_record_counts/table_record_counts_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/table_sizes/table_sizes_test.go b/internal/inspect/table_sizes/table_sizes_test.go
index 5cc6426a..057f32d1 100644
--- a/internal/inspect/table_sizes/table_sizes_test.go
+++ b/internal/inspect/table_sizes/table_sizes_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/total_index_size/total_index_size_test.go b/internal/inspect/total_index_size/total_index_size_test.go
index 8eb0e0aa..c5940146 100644
--- a/internal/inspect/total_index_size/total_index_size_test.go
+++ b/internal/inspect/total_index_size/total_index_size_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/total_table_sizes/total_table_sizes_test.go b/internal/inspect/total_table_sizes/total_table_sizes_test.go
index bc548af6..3419fc76 100644
--- a/internal/inspect/total_table_sizes/total_table_sizes_test.go
+++ b/internal/inspect/total_table_sizes/total_table_sizes_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/unused_indexes/unused_indexes_test.go b/internal/inspect/unused_indexes/unused_indexes_test.go
index ee418209..af393616 100644
--- a/internal/inspect/unused_indexes/unused_indexes_test.go
+++ b/internal/inspect/unused_indexes/unused_indexes_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/inspect/vacuum_stats/vacuum_stats_test.go b/internal/inspect/vacuum_stats/vacuum_stats_test.go
index 0d3cbec1..fba1e9a4 100644
--- a/internal/inspect/vacuum_stats/vacuum_stats_test.go
+++ b/internal/inspect/vacuum_stats/vacuum_stats_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/db/reset"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/reset"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/link/link_test.go b/internal/link/link_test.go
index 18c090ad..4f05a296 100644
--- a/internal/link/link_test.go
+++ b/internal/link/link_test.go
@@ -12,14 +12,14 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/tenant"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/tenant"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/login/login_test.go b/internal/login/login_test.go
index 758fbc5c..8dd02dea 100644
--- a/internal/login/login_test.go
+++ b/internal/login/login_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/logout/logout_test.go b/internal/logout/logout_test.go
index 42f9f8ea..5a783582 100644
--- a/internal/logout/logout_test.go
+++ b/internal/logout/logout_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/migration/apply/apply_test.go b/internal/migration/apply/apply_test.go
index 28609374..49165f27 100644
--- a/internal/migration/apply/apply_test.go
+++ b/internal/migration/apply/apply_test.go
@@ -9,11 +9,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestMigrateDatabase(t *testing.T) {
diff --git a/internal/migration/list/list_test.go b/internal/migration/list/list_test.go
index b23fa4a2..c68ade37 100644
--- a/internal/migration/list/list_test.go
+++ b/internal/migration/list/list_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/migration/new/new_test.go b/internal/migration/new/new_test.go
index 39e2fe11..232623cb 100644
--- a/internal/migration/new/new_test.go
+++ b/internal/migration/new/new_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestNewCommand(t *testing.T) {
diff --git a/internal/migration/repair/repair_test.go b/internal/migration/repair/repair_test.go
index 4dea6327..cb035c48 100644
--- a/internal/migration/repair/repair_test.go
+++ b/internal/migration/repair/repair_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/migration/squash/squash_test.go b/internal/migration/squash/squash_test.go
index cc0461f3..1cbd8584 100644
--- a/internal/migration/squash/squash_test.go
+++ b/internal/migration/squash/squash_test.go
@@ -21,14 +21,14 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/db/start"
-	"github.com/supabase/cli/internal/migration/repair"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/testing/helper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/db/start"
+	"github.com/supabase/cli/v2/internal/migration/repair"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/helper"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/migration/up/up_test.go b/internal/migration/up/up_test.go
index ea41680b..69e9c5ec 100644
--- a/internal/migration/up/up_test.go
+++ b/internal/migration/up/up_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestPendingMigrations(t *testing.T) {
diff --git a/internal/orgs/create/create_test.go b/internal/orgs/create/create_test.go
index f491bdc3..8792188f 100644
--- a/internal/orgs/create/create_test.go
+++ b/internal/orgs/create/create_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestOrganizationCreateCommand(t *testing.T) {
diff --git a/internal/orgs/list/list_test.go b/internal/orgs/list/list_test.go
index 00030dbd..d538f5fe 100644
--- a/internal/orgs/list/list_test.go
+++ b/internal/orgs/list/list_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestOrganizationListCommand(t *testing.T) {
diff --git a/internal/projects/apiKeys/api_keys_test.go b/internal/projects/apiKeys/api_keys_test.go
index 57130f15..e94a999c 100644
--- a/internal/projects/apiKeys/api_keys_test.go
+++ b/internal/projects/apiKeys/api_keys_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestProjectApiKeysCommand(t *testing.T) {
diff --git a/internal/projects/create/create_test.go b/internal/projects/create/create_test.go
index 879421d7..8db8ef3d 100644
--- a/internal/projects/create/create_test.go
+++ b/internal/projects/create/create_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestProjectCreateCommand(t *testing.T) {
diff --git a/internal/projects/delete/delete_test.go b/internal/projects/delete/delete_test.go
index b83d4cf8..aaa44122 100644
--- a/internal/projects/delete/delete_test.go
+++ b/internal/projects/delete/delete_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/projects/list/list_test.go b/internal/projects/list/list_test.go
index d5450bfb..31a1bc71 100644
--- a/internal/projects/list/list_test.go
+++ b/internal/projects/list/list_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestProjectListCommand(t *testing.T) {
diff --git a/internal/restrictions/update/update_test.go b/internal/restrictions/update/update_test.go
index 5a6583ea..e23a3101 100644
--- a/internal/restrictions/update/update_test.go
+++ b/internal/restrictions/update/update_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestUpdateRestrictionsCommand(t *testing.T) {
diff --git a/internal/secrets/list/list_test.go b/internal/secrets/list/list_test.go
index 4e0da98b..4e831d38 100644
--- a/internal/secrets/list/list_test.go
+++ b/internal/secrets/list/list_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestSecretListCommand(t *testing.T) {
diff --git a/internal/secrets/set/set_test.go b/internal/secrets/set/set_test.go
index 6021804c..beb15c7f 100644
--- a/internal/secrets/set/set_test.go
+++ b/internal/secrets/set/set_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestSecretSetCommand(t *testing.T) {
diff --git a/internal/secrets/unset/unset_test.go b/internal/secrets/unset/unset_test.go
index 3207f8df..e3f6d9df 100644
--- a/internal/secrets/unset/unset_test.go
+++ b/internal/secrets/unset/unset_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestSecretUnsetCommand(t *testing.T) {
diff --git a/internal/seed/buckets/buckets_test.go b/internal/seed/buckets/buckets_test.go
index e14a40e7..9e9c7b1a 100644
--- a/internal/seed/buckets/buckets_test.go
+++ b/internal/seed/buckets/buckets_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 func TestSeedBuckets(t *testing.T) {
diff --git a/internal/sso/get/get_test.go b/internal/sso/get/get_test.go
index bd6fd0ef..3c506ce7 100644
--- a/internal/sso/get/get_test.go
+++ b/internal/sso/get/get_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestSSOProvidersShowCommand(t *testing.T) {
diff --git a/internal/sso/list/list_test.go b/internal/sso/list/list_test.go
index 333ffd4a..50ab8d74 100644
--- a/internal/sso/list/list_test.go
+++ b/internal/sso/list/list_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestSSOProvidersListCommand(t *testing.T) {
diff --git a/internal/sso/remove/remove_test.go b/internal/sso/remove/remove_test.go
index f284f7e0..c606c862 100644
--- a/internal/sso/remove/remove_test.go
+++ b/internal/sso/remove/remove_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestSSOProvidersRemoveCommand(t *testing.T) {
diff --git a/internal/sso/update/update_test.go b/internal/sso/update/update_test.go
index 6754fd48..dd423dad 100644
--- a/internal/sso/update/update_test.go
+++ b/internal/sso/update/update_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func response(providerId string, domains []string) map[string]any {
diff --git a/internal/start/start_test.go b/internal/start/start_test.go
index 079eb3c7..93af236d 100644
--- a/internal/start/start_test.go
+++ b/internal/start/start_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/config"
-	"github.com/supabase/cli/pkg/pgtest"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/config"
+	"github.com/supabase/cli/v2/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 func TestStartCommand(t *testing.T) {
diff --git a/internal/status/status_test.go b/internal/status/status_test.go
index 391a8c99..792b99c6 100644
--- a/internal/status/status_test.go
+++ b/internal/status/status_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestStatusCommand(t *testing.T) {
diff --git a/internal/stop/stop_test.go b/internal/stop/stop_test.go
index b607d87d..cc287cb9 100644
--- a/internal/stop/stop_test.go
+++ b/internal/stop/stop_test.go
@@ -18,8 +18,8 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestStopCommand(t *testing.T) {
diff --git a/internal/storage/cp/cp_test.go b/internal/storage/cp/cp_test.go
index 75a0cf3c..83e78769 100644
--- a/internal/storage/cp/cp_test.go
+++ b/internal/storage/cp/cp_test.go
@@ -10,13 +10,13 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var mockFile = storage.ObjectResponse{
diff --git a/internal/storage/ls/ls_test.go b/internal/storage/ls/ls_test.go
index e0e2cd20..bef37987 100644
--- a/internal/storage/ls/ls_test.go
+++ b/internal/storage/ls/ls_test.go
@@ -9,14 +9,14 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/storage/client"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/storage/client"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var mockFile = storage.ObjectResponse{
diff --git a/internal/storage/mv/mv_test.go b/internal/storage/mv/mv_test.go
index fd8ecfbc..65164cc4 100644
--- a/internal/storage/mv/mv_test.go
+++ b/internal/storage/mv/mv_test.go
@@ -8,13 +8,13 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var mockFile = storage.ObjectResponse{
diff --git a/internal/storage/rm/rm_test.go b/internal/storage/rm/rm_test.go
index 46d204cf..c04a79a6 100644
--- a/internal/storage/rm/rm_test.go
+++ b/internal/storage/rm/rm_test.go
@@ -8,14 +8,14 @@ import (
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
-	"github.com/supabase/cli/pkg/fetcher"
-	"github.com/supabase/cli/pkg/storage"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/flags"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
+	"github.com/supabase/cli/v2/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/storage"
 )
 
 var mockFile = storage.ObjectResponse{
diff --git a/internal/test/new/new.go b/internal/test/new/new.go
index 506a9e02..babe6219 100644
--- a/internal/test/new/new.go
+++ b/internal/test/new/new.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 const (
diff --git a/internal/test/new/new_test.go b/internal/test/new/new_test.go
index d3f98015..a03e63db 100644
--- a/internal/test/new/new_test.go
+++ b/internal/test/new/new_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils"
 )
 
 func TestCreatePgTAP(t *testing.T) {
diff --git a/internal/testing/helper/history.go b/internal/testing/helper/history.go
index 95c846b7..7c5436dc 100644
--- a/internal/testing/helper/history.go
+++ b/internal/testing/helper/history.go
@@ -1,8 +1,8 @@
 package helper
 
 import (
-	"github.com/supabase/cli/pkg/migration"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/migration"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func MockMigrationHistory(conn *pgtest.MockConn) *pgtest.MockConn {
diff --git a/internal/unlink/unlink_test.go b/internal/unlink/unlink_test.go
index 9b526e10..e5967005 100644
--- a/internal/unlink/unlink_test.go
+++ b/internal/unlink/unlink_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/utils/access_token_test.go b/internal/utils/access_token_test.go
index f3198887..d05e5f3c 100644
--- a/internal/utils/access_token_test.go
+++ b/internal/utils/access_token_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils/credentials"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils/credentials"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/internal/utils/api_test.go b/internal/utils/api_test.go
index 09365897..8a858441 100644
--- a/internal/utils/api_test.go
+++ b/internal/utils/api_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils/cloudflare"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils/cloudflare"
 )
 
 const host = "api.supabase.io"
diff --git a/internal/utils/connect_test.go b/internal/utils/connect_test.go
index 4ea76c12..f66b6665 100644
--- a/internal/utils/connect_test.go
+++ b/internal/utils/connect_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/utils/cloudflare"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/utils/cloudflare"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var dbConfig = pgconn.Config{
diff --git a/internal/utils/console_test.go b/internal/utils/console_test.go
index 19857ee1..f7662d2d 100644
--- a/internal/utils/console_test.go
+++ b/internal/utils/console_test.go
@@ -2,12 +2,10 @@ package utils
 
 import (
 	"context"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
 )
 
 func TestPromptYesNo(t *testing.T) {
@@ -34,15 +32,7 @@ func TestPromptYesNo(t *testing.T) {
 
 func TestPromptText(t *testing.T) {
 	t.Run("defaults on timeout", func(t *testing.T) {
-		// Setup stdin
-		r, _, err := os.Pipe()
-		require.NoError(t, err)
-		// Replace stdin
-		oldStdin := os.Stdin
-		defer func() {
-			os.Stdin = oldStdin
-		}()
-		os.Stdin = r
+		t.Cleanup(fstest.MockStdin(t, ""))
 		c := NewConsole()
 		// Run test
 		val, err := c.PromptText(context.Background(), "test")
diff --git a/internal/utils/docker_test.go b/internal/utils/docker_test.go
index 6a0cdf03..ef166611 100644
--- a/internal/utils/docker_test.go
+++ b/internal/utils/docker_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
 )
 
 const (
diff --git a/internal/utils/flags/project_ref_test.go b/internal/utils/flags/project_ref_test.go
index 9932d617..ee12de88 100644
--- a/internal/utils/flags/project_ref_test.go
+++ b/internal/utils/flags/project_ref_test.go
@@ -4,17 +4,19 @@ import (
 	"context"
 	"net/http"
 	"os"
+	"strings"
 	"testing"
 
+	tea "github.com/charmbracelet/bubbletea"
 	"github.com/go-errors/errors"
 	"github.com/h2non/gock"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/internal/testing/fstest"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/internal/testing/fstest"
+	"github.com/supabase/cli/v2/internal/utils"
+	"github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestProjectRef(t *testing.T) {
@@ -69,6 +71,7 @@ func TestProjectPrompt(t *testing.T) {
 	t.Setenv("SUPABASE_ACCESS_TOKEN", string(token))
 
 	t.Run("validates prompt input", func(t *testing.T) {
+		input := tea.WithInput(strings.NewReader("\r"))
 		// Setup mock api
 		defer gock.OffAll()
 		gock.New(utils.DefaultApiHost).
@@ -80,9 +83,9 @@ func TestProjectPrompt(t *testing.T) {
 				OrganizationId: "test-org",
 			}})
 		// Run test
-		err := PromptProjectRef(context.Background(), "")
+		err := PromptProjectRef(context.Background(), "", input)
 		// Check error
-		assert.ErrorContains(t, err, "failed to prompt choice:")
+		assert.NoError(t, err)
 		assert.Empty(t, apitest.ListUnmatchedRequests())
 	})
 
diff --git a/internal/utils/release_test.go b/internal/utils/release_test.go
index 25aa920e..c5f41327 100644
--- a/internal/utils/release_test.go
+++ b/internal/utils/release_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/google/go-github/v62/github"
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/internal/testing/apitest"
-	"github.com/supabase/cli/pkg/cast"
+	"github.com/supabase/cli/v2/internal/testing/apitest"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func TestLatestRelease(t *testing.T) {
diff --git a/internal/utils/tenant/gotrue_test.go b/internal/utils/tenant/gotrue_test.go
index fcc646e0..8c08d486 100644
--- a/internal/utils/tenant/gotrue_test.go
+++ b/internal/utils/tenant/gotrue_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/v2/pkg/fetcher"
 )
 
 var mockApi = TenantAPI{Fetcher: fetcher.NewFetcher(
diff --git a/pkg/config/api_test.go b/pkg/config/api_test.go
index 92859c67..951ea3c7 100644
--- a/pkg/config/api_test.go
+++ b/pkg/config/api_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	v1API "github.com/supabase/cli/pkg/api"
+	v1API "github.com/supabase/cli/v2/pkg/api"
 )
 
 func TestApiToUpdatePostgrestConfigBody(t *testing.T) {
diff --git a/pkg/config/auth_test.go b/pkg/config/auth_test.go
index 057c5ccd..428a6d05 100644
--- a/pkg/config/auth_test.go
+++ b/pkg/config/auth_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func newWithDefaults() auth {
diff --git a/pkg/config/db_test.go b/pkg/config/db_test.go
index 575fd202..8e7006d1 100644
--- a/pkg/config/db_test.go
+++ b/pkg/config/db_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func TestDbSettingsToUpdatePostgresConfigBody(t *testing.T) {
diff --git a/pkg/config/updater_test.go b/pkg/config/updater_test.go
index 471e8496..d595d60b 100644
--- a/pkg/config/updater_test.go
+++ b/pkg/config/updater_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	v1API "github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/cast"
+	v1API "github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/cast"
 )
 
 func TestUpdateApi(t *testing.T) {
diff --git a/pkg/function/batch_test.go b/pkg/function/batch_test.go
index 1489cd32..dfba2f4a 100644
--- a/pkg/function/batch_test.go
+++ b/pkg/function/batch_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/h2non/gock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/v2/pkg/api"
+	"github.com/supabase/cli/v2/pkg/config"
 )
 
 type MockBundler struct {
diff --git a/pkg/migration/apply_test.go b/pkg/migration/apply_test.go
index 65a75028..060702f1 100644
--- a/pkg/migration/apply_test.go
+++ b/pkg/migration/apply_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/jackc/pgerrcode"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestPendingMigrations(t *testing.T) {
diff --git a/pkg/migration/drop_test.go b/pkg/migration/drop_test.go
index d2c25ed5..a218d883 100644
--- a/pkg/migration/drop_test.go
+++ b/pkg/migration/drop_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/jackc/pgerrcode"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 var escapedSchemas = append(ManagedSchemas, "extensions", "public")
diff --git a/pkg/migration/file_test.go b/pkg/migration/file_test.go
index a38238f8..3b2877c5 100644
--- a/pkg/migration/file_test.go
+++ b/pkg/migration/file_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/jackc/pgerrcode"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/parser"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/parser"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestMigrationFile(t *testing.T) {
diff --git a/pkg/migration/list_test.go b/pkg/migration/list_test.go
index 80d09fd4..40a19348 100644
--- a/pkg/migration/list_test.go
+++ b/pkg/migration/list_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/jackc/pgerrcode"
 	"github.com/stretchr/testify/assert"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 func TestRemoteMigrations(t *testing.T) {
diff --git a/pkg/migration/seed_test.go b/pkg/migration/seed_test.go
index 7e9cd4ac..1d228e53 100644
--- a/pkg/migration/seed_test.go
+++ b/pkg/migration/seed_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/cli/pkg/pgtest"
+	"github.com/supabase/cli/v2/pkg/pgtest"
 )
 
 //go:embed testdata/seed.sql
diff --git a/pkg/pgtest/mock.go b/pkg/pgtest/mock.go
index 0f5e9bb8..daa1dbd2 100644
--- a/pkg/pgtest/mock.go
+++ b/pkg/pgtest/mock.go
@@ -12,7 +12,7 @@ import (
 	"github.com/jackc/pgproto3/v2"
 	"github.com/jackc/pgtype"
 	"github.com/jackc/pgx/v4"
-	"github.com/supabase/cli/pkg/pgxv5"
+	"github.com/supabase/cli/v2/pkg/pgxv5"
 	"google.golang.org/grpc/test/bufconn"
 )
 
diff --git a/test/branch_test.go b/test/branch_test.go
deleted file mode 100644
index 07d3608d..00000000
--- a/test/branch_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package integration
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/stretchr/testify/require"
-)
-
-// this is the part of Database test suite - DBTestSuite
-// test functions
-func (suite *DBTestSuite) TestBranchCreate() {
-	suite.T().Skip("Local branching is deprecated")
-	// create branch
-	branch := "test-branch"
-	create, args, err := suite.cmd.Traverse([]string{"db", "branch", "create", branch})
-	require.NoError(suite.T(), err)
-	create.SetContext(context.Background())
-	err = create.RunE(create, args)
-	require.NoError(suite.T(), err)
-
-	// check if branch dir exists
-	_, err = os.Stat("supabase/.branches/" + branch)
-	require.NoError(suite.T(), err)
-
-	// check if all exec calls were made to docker api
-	ids := suite.constructParams()
-	require.ElementsMatch(suite.T(), suite.params, ids)
-
-	// check commands in exec calls
-	require.Equal(suite.T(), 2, len(suite.bodies))
-	var execBody container.ExecOptions
-	require.NoError(suite.T(), json.Unmarshal([]byte(suite.bodies[0]), &execBody))
-	var startBody container.ExecStartOptions
-	require.NoError(suite.T(), json.Unmarshal([]byte(suite.bodies[1]), &startBody))
-}
diff --git a/test/db_test.go b/test/db_test.go
deleted file mode 100644
index 45de0ef2..00000000
--- a/test/db_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"context"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/test/mocks/docker"
-)
-
-type DBTestSuite struct {
-	suite.Suite
-	cmd     *cobra.Command
-	tempDir string
-	ids     []string
-	bodies  []string
-	params  []gin.Params
-	mtx     sync.RWMutex
-}
-
-// test functions
-// add tests here <-
-
-// hooks
-func (suite *DBTestSuite) SetupTest() {
-	suite.tempDir = NewTempDir(Logger, TempDir)
-	suite.mtx.Lock()
-	suite.ids = []string{}
-	suite.bodies = []string{}
-	suite.params = []gin.Params{}
-	suite.mtx.Unlock()
-
-	// add docker mock handlers
-	DockerMock.ExecCreateHandler = func(c *gin.Context) {
-		suite.addParams(c.Copy())
-		body, err := io.ReadAll(c.Request.Body)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
-				"message": "error reading body",
-			})
-			return
-		}
-		suite.addBody(body)
-
-		id := gonanoid.MustGenerate(docker.IDAlphabet, docker.IDLength)
-		c.JSON(http.StatusCreated, gin.H{
-			"Id": id,
-		})
-		suite.addID(id)
-	}
-
-	DockerMock.ExecStartHandler = func(c *gin.Context) {
-		suite.addParams(c.Copy())
-		body, err := io.ReadAll(c.Request.Body)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
-				"message": "error reading body",
-			})
-			return
-		}
-		suite.addBody(body)
-
-		docker.HijackedResponse(c, "0")
-	}
-
-	DockerMock.ContainerInspectHandler = func(c *gin.Context) {
-		c.JSON(http.StatusOK, gin.H{})
-	}
-
-	// create supabase dir
-	suite.cmd = clicmd.GetRootCmd()
-	init, _, err := suite.cmd.Find([]string{"init"})
-	require.NoError(suite.T(), err)
-	init.SetContext(context.Background())
-	err = init.RunE(init, []string{})
-	require.NoError(suite.T(), err)
-
-	err = os.Mkdir("supabase/.branches", os.FileMode(0755))
-	require.NoError(suite.T(), err)
-}
-
-func (suite *DBTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestDBTestSuite(t *testing.T) {
-	suite.Run(t, new(DBTestSuite))
-}
-
-// helper functions
-func (suite *DBTestSuite) addParams(c *gin.Context) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.params = append(suite.params, c.Params)
-}
-
-func (suite *DBTestSuite) addBody(body []byte) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.bodies = append(suite.bodies, string(body))
-}
-
-func (suite *DBTestSuite) addID(id string) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.ids = append(suite.ids, id)
-}
-
-func (suite *DBTestSuite) constructParams() []gin.Params {
-	ids := []gin.Params{}
-	// for each exec docker call we have to calls to docker api:
-	// one to create exec, one to start exec
-	for _, id := range suite.ids {
-		// this one represents call to create exec
-		ids = append(ids, gin.Params{
-			gin.Param{
-				Key:   "id",
-				Value: "supabase_db_" + filepath.Base(suite.tempDir),
-			},
-		})
-
-		// this one represents call to start exec
-		ids = append(ids, gin.Params{
-			gin.Param{
-				Key:   "id",
-				Value: id,
-			},
-		})
-	}
-	return ids
-}
diff --git a/test/init_test.go b/test/init_test.go
deleted file mode 100644
index bdc8b7b7..00000000
--- a/test/init_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"context"
-	"os"
-	"testing"
-
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/internal/utils"
-)
-
-type InitTestSuite struct {
-	suite.Suite
-	tempDir string
-	cmd     *cobra.Command
-}
-
-// test functions
-func (suite *InitTestSuite) TestInit() {
-	// init supabase
-	init, _, err := suite.cmd.Find([]string{"init"})
-	require.NoError(suite.T(), err)
-	init.SetContext(context.Background())
-	require.NoError(suite.T(), init.RunE(init, []string{}))
-
-	// check if init dir exists
-	_, err = os.Stat(utils.ConfigPath)
-	require.NoError(suite.T(), err)
-}
-
-// hooks
-func (suite *InitTestSuite) SetupTest() {
-	// init cli
-	suite.cmd = clicmd.GetRootCmd()
-	suite.tempDir = NewTempDir(Logger, TempDir)
-}
-
-func (suite *InitTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestInitTestSuite(t *testing.T) {
-	suite.Run(t, new(InitTestSuite))
-}
diff --git a/test/link_test.go b/test/link_test.go
deleted file mode 100644
index afef6c6f..00000000
--- a/test/link_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"os"
-	"sync"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/pkg/api"
-	"github.com/supabase/cli/test/mocks/supabase"
-)
-
-type LinkTestSuite struct {
-	suite.Suite
-	tempDir string
-	cmd     *cobra.Command
-
-	ids     []string
-	headers []http.Header
-
-	mtx sync.RWMutex
-}
-
-// test functions
-func (suite *LinkTestSuite) TestLink() {
-	// run command
-	link, _, err := suite.cmd.Find([]string{"link"})
-	link.SetContext(context.Background())
-	require.NoError(suite.T(), err)
-
-	id := gonanoid.MustGenerate(supabase.IDAlphabet, supabase.IDLength)
-	require.NoError(suite.T(), link.Flags().Set("project-ref", id))
-	require.NoError(suite.T(), link.Flags().Set("password", "postgres"))
-
-	require.NoError(suite.T(), link.RunE(link, []string{}))
-
-	// check request details
-	suite.mtx.RLock()
-	defer suite.mtx.RUnlock()
-	require.Contains(suite.T(), suite.ids, id)
-	require.Contains(suite.T(), suite.headers, http.Header{
-		"Authorization":   []string{fmt.Sprintf("Bearer %s", supabase.AccessToken)},
-		"Accept-Encoding": []string{"gzip"},
-		"User-Agent":      []string{"Go-http-client/1.1"},
-	})
-	_, err = os.Stat(utils.ProjectRefPath)
-	require.NoError(suite.T(), err)
-	ref, err := os.ReadFile(utils.ProjectRefPath)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), id, string(ref))
-}
-
-// hooks
-func (suite *LinkTestSuite) SetupTest() {
-	// init cli
-	suite.cmd = clicmd.GetRootCmd()
-	suite.tempDir = NewTempDir(Logger, TempDir)
-
-	// init supabase
-	init, _, err := suite.cmd.Find([]string{"init"})
-	init.SetContext(context.Background())
-	require.NoError(suite.T(), err)
-	require.NoError(suite.T(), init.RunE(init, []string{}))
-
-	// implement mocks
-	SupaMock.FunctionsHandler = func(c *gin.Context) {
-		suite.addHeaders(c.Request.Header)
-		suite.addID(c.Params.ByName("id"))
-
-		c.JSON(http.StatusOK, []api.FunctionResponse{})
-	}
-}
-
-func (suite *LinkTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestLinkTestSuite(t *testing.T) {
-	// suite.Run(t, new(LinkTestSuite))
-}
-
-// helper functions
-func (suite *LinkTestSuite) addID(id string) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.ids = append(suite.ids, id)
-}
-
-func (suite *LinkTestSuite) addHeaders(headers http.Header) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.headers = append(suite.headers, headers)
-}
diff --git a/test/login_test.go b/test/login_test.go
deleted file mode 100644
index 2f1e018f..00000000
--- a/test/login_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"context"
-	"net/http"
-	"os"
-	"sync"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/test/mocks/supabase"
-)
-
-type LoginTestSuite struct {
-	suite.Suite
-	tempDir string
-	cmd     *cobra.Command
-
-	ids     []string
-	headers []http.Header
-
-	mtx sync.RWMutex
-}
-
-// test functions
-func (suite *LoginTestSuite) TestLink() {
-	// run command
-	login, _, err := suite.cmd.Find([]string{"login"})
-	require.NoError(suite.T(), err)
-	login.SetContext(context.Background())
-	key := "sbp_" + gonanoid.MustGenerate(supabase.KeyAlphabet, supabase.KeyLength)
-
-	// change stdin to read from a file
-	content := []byte(key)
-	tmpfile, err := os.CreateTemp(suite.tempDir, "key")
-	require.NoError(suite.T(), err)
-	defer os.Remove(tmpfile.Name()) // clean up
-
-	_, err = tmpfile.Write(content)
-	require.NoError(suite.T(), err)
-	_, err = tmpfile.Seek(0, 0)
-	require.NoError(suite.T(), err)
-
-	oldStdin := os.Stdin
-	defer func() { os.Stdin = oldStdin }()
-	os.Stdin = tmpfile
-
-	err = login.Flags().Set("token", key)
-	require.NoError(suite.T(), err)
-	require.NoError(suite.T(), login.RunE(login, []string{}))
-
-	// check token is saved
-	// home, err := os.UserHomeDir()
-	// require.NoError(suite.T(), err)
-	// _, err = os.Stat(filepath.Join(home, ".supabase/access-token"))
-	// require.NoError(suite.T(), err)
-	// token, err := os.ReadFile(filepath.Join(home, ".supabase/access-token"))
-	// require.NoError(suite.T(), err)
-	// require.Equal(suite.T(), key, string(token))
-}
-
-// hooks
-func (suite *LoginTestSuite) SetupTest() {
-	// init cli
-	suite.cmd = clicmd.GetRootCmd()
-	suite.tempDir = NewTempDir(Logger, TempDir)
-
-	// init supabase
-	init, _, err := suite.cmd.Find([]string{"init"})
-	require.NoError(suite.T(), err)
-	init.SetContext(context.Background())
-	require.NoError(suite.T(), init.RunE(init, []string{}))
-
-	// implement mocks
-	SupaMock.FunctionsHandler = func(c *gin.Context) {
-		suite.addHeaders(c.Request.Header)
-		suite.addID(c.Params.ByName("id"))
-
-		c.JSON(http.StatusOK, gin.H{})
-	}
-}
-
-func (suite *LoginTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestLoginTestSuite(t *testing.T) {
-	suite.Run(t, new(LoginTestSuite))
-}
-
-// helper functions
-func (suite *LoginTestSuite) addID(id string) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.ids = append(suite.ids, id)
-}
-
-func (suite *LoginTestSuite) addHeaders(headers http.Header) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.headers = append(suite.headers, headers)
-}
diff --git a/test/main_test.go b/test/main_test.go
deleted file mode 100644
index 6d694e70..00000000
--- a/test/main_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package integration
-
-import (
-	"log"
-	"os"
-	"testing"
-
-	"github.com/docker/docker/client"
-	"github.com/spf13/viper"
-	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/test/mocks/docker"
-	"github.com/supabase/cli/test/mocks/supabase"
-)
-
-const (
-	DockerPort   = ":2375"
-	SupabasePort = ":2376"
-)
-
-var (
-	TempDir string
-)
-
-var (
-	Logger     *log.Logger
-	DockerMock *docker.Server
-	SupaMock   *supabase.Server
-)
-
-func TestMain(m *testing.M) {
-	Logger := log.New(os.Stdout, "", 0)
-
-	Logger.Println("Global tests setup")
-
-	DockerMock = newDockerMock(Logger)
-	SupaMock = newSupabaseMock(Logger)
-	TempDir = NewTempDir(Logger, "")
-
-	// redirect clients to mock servers
-	os.Setenv("DOCKER_HOST", "tcp://127.0.0.1"+DockerPort)
-	utils.Docker = utils.NewDocker()
-	if err := client.WithVersion(docker.APIVersion)(utils.Docker); err != nil {
-		Logger.Fatal(err)
-	}
-	viper.Set("INTERNAL_API_HOST", "http://127.0.0.1"+SupabasePort)
-	os.Setenv("SUPABASE_ACCESS_TOKEN", supabase.AccessToken)
-	os.Setenv("HOME", TempDir)
-
-	// run tests
-	exitVal := m.Run()
-
-	Logger.Println("Global teardown")
-	os.RemoveAll(TempDir)
-
-	// exit process with tests exit code
-	os.Exit(exitVal)
-}
-
-func newDockerMock(Logger *log.Logger) *docker.Server {
-	dockerMock := docker.NewServer()
-	dockerRouter := dockerMock.NewRouter()
-	go func() {
-		err := dockerRouter.Run(DockerPort)
-		if err != nil {
-			Logger.Fatal(err)
-		}
-	}()
-
-	return dockerMock
-}
-
-func newSupabaseMock(Logger *log.Logger) *supabase.Server {
-	supaMock := supabase.NewServer()
-	supaRouter := supaMock.NewRouter()
-	go func() {
-		err := supaRouter.Run(SupabasePort)
-		if err != nil {
-			Logger.Fatal(err)
-		}
-	}()
-
-	return supaMock
-}
-
-func NewTempDir(Logger *log.Logger, baseDir string) string {
-	wd := baseDir
-	var err error
-	if baseDir == "" {
-		wd, err = os.Getwd()
-	}
-	if err != nil {
-		Logger.Fatal(err)
-	}
-	tempDir, err := os.MkdirTemp(wd, "cli-test-")
-	if err != nil {
-		Logger.Fatal(err)
-	}
-	err = os.Chdir(tempDir)
-	if err != nil {
-		Logger.Fatal(err)
-	}
-	return tempDir
-}
diff --git a/test/migration_test.go b/test/migration_test.go
deleted file mode 100644
index 2321735d..00000000
--- a/test/migration_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"os"
-	"testing"
-
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/test/mocks/supabase"
-)
-
-type MigrationTestSuite struct {
-	suite.Suite
-	tempDir string
-	cmd     *cobra.Command
-}
-
-// test functions
-func (suite *MigrationTestSuite) TestNewMigration() {
-	// run command
-	migration, _, err := suite.cmd.Find([]string{"migration", "new"})
-	require.NoError(suite.T(), err)
-	name := gonanoid.MustGenerate(supabase.IDAlphabet, 10)
-	require.NoError(suite.T(), migration.RunE(migration, []string{name}))
-
-	// check migrations file created
-	subs, err := os.ReadDir("supabase/migrations")
-	require.NoError(suite.T(), err)
-	require.Regexp(suite.T(), `[0-9]{14}_`+name+".sql", subs[0].Name())
-}
-
-// hooks
-func (suite *MigrationTestSuite) SetupTest() {
-	// init cli
-	suite.cmd = clicmd.GetRootCmd()
-	suite.tempDir = NewTempDir(Logger, TempDir)
-
-	// init supabase
-	init, _, err := suite.cmd.Find([]string{"init"})
-	require.NoError(suite.T(), err)
-	require.NoError(suite.T(), init.RunE(init, []string{}))
-}
-
-func (suite *MigrationTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestMigrationTestSuite(t *testing.T) {
-	suite.Run(t, new(MigrationTestSuite))
-}
diff --git a/test/mocks/docker/httputils.go b/test/mocks/docker/httputils.go
deleted file mode 100644
index c8a4496a..00000000
--- a/test/mocks/docker/httputils.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package docker
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/gin-gonic/gin"
-)
-
-func CloseStreams(streams ...interface{}) {
-	for _, stream := range streams {
-		if tcpc, ok := stream.(interface {
-			CloseWrite() error
-		}); ok {
-			_ = tcpc.CloseWrite()
-		} else if closer, ok := stream.(io.Closer); ok {
-			_ = closer.Close()
-		}
-	}
-}
-
-func HijackedResponse(c *gin.Context, exitCode string, output ...string) {
-	// hijack the connection
-	hijacker, ok := c.Writer.(http.Hijacker)
-	if !ok {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": "error hijacking connection",
-		})
-		return
-	}
-	conn, _, err := hijacker.Hijack()
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": "error hijacking connection",
-		})
-		return
-	}
-	_, err = conn.Write([]byte{})
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": "error hijacking connection",
-		})
-		return
-	}
-
-	// write success code signalizing that the connection is established and ready to stream data
-	fmt.Fprintf(conn, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
-
-	// setup closer
-	closer := func() error {
-		CloseStreams(conn)
-		return nil
-	}
-
-	// write some output if command suppose to write to stdout
-	outStream := stdcopy.NewStdWriter(conn, stdcopy.Stdout)
-	if len(output) > 0 {
-		fmt.Fprint(outStream, output)
-	}
-	// finish with exit code and close stream and connection as the command is done
-	fmt.Fprintf(outStream, "exit code %s", exitCode)
-	rc := ioutils.NewReadCloserWrapper(conn, closer)
-	rc.Close()
-}
diff --git a/test/mocks/docker/server.go b/test/mocks/docker/server.go
deleted file mode 100644
index 705c7b4e..00000000
--- a/test/mocks/docker/server.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package docker
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-)
-
-const (
-	APIVersion = "1.44"
-	IDAlphabet = "abcdef0123456789"
-	IDLength   = 12
-)
-
-// Server struct with route handlers
-type Server struct {
-	PingHandler             func(c *gin.Context)
-	ContainerInspectHandler func(c *gin.Context)
-	ExecCreateHandler       func(c *gin.Context)
-	ExecStartHandler        func(c *gin.Context)
-}
-
-var defaultHandler = func(c *gin.Context) {
-	c.JSON(http.StatusNotImplemented, gin.H{
-		"message": "Not implemented",
-	})
-}
-
-// NewServer creates a new server with default handlers
-func NewServer() *Server {
-	s := Server{
-		ExecCreateHandler:       defaultHandler,
-		ExecStartHandler:        defaultHandler,
-		ContainerInspectHandler: defaultHandler,
-	}
-	return &s
-}
-
-// NewRouter creating a new router and setting the routes for the server.
-func (s *Server) NewRouter() *gin.Engine {
-	root := gin.Default()
-	root.HEAD("/_ping", s.ping)
-	root.GET("/_ping", s.ping)
-
-	router := root.Group("/v" + APIVersion)
-
-	containers := router.Group("/containers")
-	containers.GET("/:id/json", s.inspectContainer)
-	containers.POST("/:id/exec", s.createExec)
-
-	exec := router.Group("/exec")
-	exec.POST("/:id/start", s.startExec)
-	exec.GET("/:id/json", s.inspectContainer)
-
-	return root
-}
-
-// ping
-func (s *Server) ping(c *gin.Context) {
-	if s.PingHandler == nil {
-		c.Header("API-Version", APIVersion)
-		c.Header("OSType", "linux")
-		c.Status(http.StatusOK)
-	} else {
-		s.PingHandler(c)
-	}
-}
-
-// container
-func (s *Server) inspectContainer(c *gin.Context) {
-	if s.ContainerInspectHandler == nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"message": "handler is nil",
-		})
-	} else {
-		s.ContainerInspectHandler(c)
-	}
-}
-
-// exec
-func (s *Server) createExec(c *gin.Context) {
-	if s.ExecCreateHandler == nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"message": "handler is nil",
-		})
-	} else {
-		s.ExecCreateHandler(c)
-	}
-}
-
-func (s *Server) startExec(c *gin.Context) {
-	if s.ExecStartHandler == nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"message": "handler is nil",
-		})
-	} else {
-		s.ExecStartHandler(c)
-	}
-}
diff --git a/test/mocks/supabase/server.go b/test/mocks/supabase/server.go
deleted file mode 100644
index 41eb8c54..00000000
--- a/test/mocks/supabase/server.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package supabase
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	gonanoid "github.com/matoous/go-nanoid/v2"
-)
-
-const (
-	IDAlphabet  = "abcdefghijklmnopqrstuvwxyz"
-	IDLength    = 20
-	KeyAlphabet = "abcdef0123456789"
-	KeyLength   = 40
-)
-
-var AccessToken = "sbp_" + gonanoid.MustGenerate(KeyAlphabet, KeyLength)
-
-// Server struct with route handlers
-type Server struct {
-	FunctionsHandler func(c *gin.Context)
-	SecretsHandler   func(c *gin.Context)
-}
-
-var defaultHandler = func(c *gin.Context) {
-	c.JSON(http.StatusNotImplemented, gin.H{
-		"message": "Not implemented",
-	})
-}
-
-// NewServer creates a new server with default handlers
-func NewServer() *Server {
-	s := Server{
-		FunctionsHandler: defaultHandler,
-		SecretsHandler:   defaultHandler,
-	}
-	return &s
-}
-
-// NewRouter creating a new router and setting the routes for the server.
-func (s *Server) NewRouter() *gin.Engine {
-	root := gin.Default()
-	router := root.Group("/v1")
-
-	projects := router.Group("/projects")
-	projects.GET("/:id/functions", s.functions)
-	projects.GET("/:id/secrets", s.secrets)
-	projects.GET("/:id/api-keys", func(c *gin.Context) {
-		c.JSON(http.StatusOK, []gin.H{})
-	})
-
-	return root
-}
-
-// project routes
-func (s *Server) functions(c *gin.Context) {
-	if s.FunctionsHandler == nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"message": "handler is nil",
-		})
-	} else {
-		s.FunctionsHandler(c)
-	}
-}
-
-func (s *Server) secrets(c *gin.Context) {
-	if s.SecretsHandler == nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"message": "handler is nil",
-		})
-	} else {
-		s.SecretsHandler(c)
-	}
-}
diff --git a/test/secrets_test.go b/test/secrets_test.go
deleted file mode 100644
index b195e23e..00000000
--- a/test/secrets_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"os"
-	"sync"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-	"github.com/supabase/cli/internal/utils/flags"
-	"github.com/supabase/cli/test/mocks/supabase"
-)
-
-type SecretsTestSuite struct {
-	suite.Suite
-	tempDir string
-	cmd     *cobra.Command
-
-	ids     []string
-	headers []http.Header
-
-	mtx sync.RWMutex
-}
-
-// test functions
-func (suite *SecretsTestSuite) TestList() {
-	// run command
-	list, _, err := suite.cmd.Find([]string{"secrets", "list"})
-	list.SetContext(context.Background())
-	require.NoError(suite.T(), err)
-
-	// set stdout to write into file so we can capture cmd output
-	tmpfile, err := os.CreateTemp(suite.tempDir, "output")
-	require.NoError(suite.T(), err)
-	defer os.Remove(tmpfile.Name()) // clean up
-	oldStdout := os.Stdout
-	defer func() { os.Stdout = oldStdout }()
-	os.Stdout = tmpfile
-
-	flags.ProjectRef = gonanoid.MustGenerate(supabase.IDAlphabet, supabase.IDLength)
-	require.NoError(suite.T(), list.RunE(list, []string{}))
-
-	// check request details
-	suite.mtx.RLock()
-	defer suite.mtx.RUnlock()
-	require.Contains(suite.T(), suite.ids, flags.ProjectRef)
-	require.Contains(suite.T(), suite.headers, http.Header{
-		"Authorization":   []string{fmt.Sprintf("Bearer %s", supabase.AccessToken)},
-		"Accept-Encoding": []string{"gzip"},
-		"User-Agent":      []string{"SupabaseCLI/"},
-	})
-
-	contents, err := os.ReadFile(tmpfile.Name())
-	require.NoError(suite.T(), err)
-	require.Contains(suite.T(), string(contents), "some-key")
-	require.Contains(suite.T(), string(contents), "another")
-}
-
-// hooks
-func (suite *SecretsTestSuite) SetupTest() {
-	// init cli
-	suite.cmd = clicmd.GetRootCmd()
-	suite.tempDir = NewTempDir(Logger, TempDir)
-
-	// init supabase
-	init, _, err := suite.cmd.Find([]string{"init"})
-	require.NoError(suite.T(), err)
-	init.SetContext(context.Background())
-	require.NoError(suite.T(), init.RunE(init, []string{}))
-
-	// add `link` dir
-	require.NoError(suite.T(), os.MkdirAll("supabase/.temp", os.FileMode(0755)))
-
-	// implement mocks
-	SupaMock.SecretsHandler = func(c *gin.Context) {
-		suite.addHeaders(c.Request.Header)
-		suite.addID(c.Params.ByName("id"))
-
-		c.JSON(http.StatusOK, []gin.H{
-			{
-				"Name":  "some-key",
-				"Value": gonanoid.Must(),
-			},
-			{
-				"Name":  "another",
-				"Value": gonanoid.Must(),
-			},
-		})
-	}
-}
-
-func (suite *SecretsTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestSecretsTestSuite(t *testing.T) {
-	suite.Run(t, new(SecretsTestSuite))
-}
-
-// helper functions
-func (suite *SecretsTestSuite) addID(id string) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.ids = append(suite.ids, id)
-}
-
-func (suite *SecretsTestSuite) addHeaders(headers http.Header) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.headers = append(suite.headers, headers)
-}
diff --git a/test/status_test.go b/test/status_test.go
deleted file mode 100644
index 509345d1..00000000
--- a/test/status_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package integration
-
-// Basic imports
-import (
-	"context"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/gin-gonic/gin"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	clicmd "github.com/supabase/cli/cmd"
-)
-
-type StatusTestSuite struct {
-	suite.Suite
-	tempDir string
-	cmd     *cobra.Command
-
-	params []gin.Params
-	mtx    sync.RWMutex
-}
-
-// test functions
-func (suite *StatusTestSuite) TestStatus() {
-	suite.T().Skip("Status command is no longer mocked")
-	// run command
-	status, _, err := suite.cmd.Find([]string{"status"})
-	status.SetContext(context.Background())
-	require.NoError(suite.T(), err)
-
-	// set stdout to write into file so we can capture cmd output
-	tmpfile, err := os.CreateTemp(suite.tempDir, "output")
-	require.NoError(suite.T(), err)
-	defer os.Remove(tmpfile.Name()) // clean up
-	oldStdout := os.Stdout
-	defer func() { os.Stdout = oldStdout }()
-	os.Stdout = tmpfile
-
-	// run command
-	require.NoError(suite.T(), status.RunE(status, []string{}))
-
-	// check request details
-	suite.mtx.RLock()
-	defer suite.mtx.RUnlock()
-	require.Contains(suite.T(), suite.params, gin.Params{
-		gin.Param{
-			Key:   "id",
-			Value: "supabase_db_" + filepath.Base(suite.tempDir),
-		},
-	})
-
-	contents, err := os.ReadFile(tmpfile.Name())
-	require.NoError(suite.T(), err)
-	require.Contains(suite.T(), string(contents), "API URL: http://127.0.0.1:54321")
-	require.Contains(suite.T(), string(contents), "GraphQL URL: http://127.0.0.1:54321/graphql/v1")
-	require.Contains(suite.T(), string(contents), "DB URL: postgresql://postgres:postgres@127.0.0.1:54322/postgres")
-	require.Contains(suite.T(), string(contents), "Studio URL: http://127.0.0.1:54323")
-	require.Contains(suite.T(), string(contents), "Inbucket URL: http://127.0.0.1:54324")
-	require.Contains(suite.T(), string(contents), "JWT secret: super-secret-jwt-token-with-at-least-32-characters-long")
-	require.Contains(suite.T(), string(contents), "anon key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9")
-	require.Contains(suite.T(), string(contents), "service_role key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9")
-}
-
-// hooks
-func (suite *StatusTestSuite) SetupTest() {
-	// init cli
-	suite.cmd = clicmd.GetRootCmd()
-	suite.tempDir = NewTempDir(Logger, TempDir)
-
-	// init supabase
-	init, _, err := suite.cmd.Find([]string{"init"})
-	require.NoError(suite.T(), err)
-	init.SetContext(context.Background())
-	require.NoError(suite.T(), init.RunE(init, []string{}))
-
-	// implement mocks
-	DockerMock.ContainerInspectHandler = func(c *gin.Context) {
-		suite.addParams(c.Copy())
-		c.JSON(http.StatusOK, types.ContainerJSON{
-			ContainerJSONBase: &types.ContainerJSONBase{
-				State: &types.ContainerState{Running: true},
-			},
-		})
-	}
-}
-
-func (suite *StatusTestSuite) TeardownTest() {
-	require.NoError(suite.T(), os.Chdir(TempDir))
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestStatusTestSuite(t *testing.T) {
-	suite.Run(t, new(StatusTestSuite))
-}
-
-// helper functions
-func (suite *StatusTestSuite) addParams(c *gin.Context) {
-	suite.mtx.Lock()
-	defer suite.mtx.Unlock()
-	suite.params = append(suite.params, c.Params)
-}