diff --git a/apps/login/acceptance/oidcrp/main.go b/apps/login/acceptance/oidcrp/main.go
index 72ae5f57e9..83efa12a71 100644
--- a/apps/login/acceptance/oidcrp/main.go
+++ b/apps/login/acceptance/oidcrp/main.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
-
 	"github.com/zitadel/logging"
 	"github.com/zitadel/oidc/v3/pkg/client/rp"
 	httphelper "github.com/zitadel/oidc/v3/pkg/http"
diff --git a/backend/v3/domain/id_provider.go b/backend/v3/domain/id_provider.go
index 3740ccad50..b077aedefd 100644
--- a/backend/v3/domain/id_provider.go
+++ b/backend/v3/domain/id_provider.go
@@ -42,6 +42,7 @@ const (
 	OIDCMappingFieldPreferredLoginName
 	OIDCMappingFieldEmail
 	// count is for validation purposes
+	//nolint: unused
 	oidcMappingFieldCount
 )
 
diff --git a/backend/v3/storage/database/repository/id_provider_test.go b/backend/v3/storage/database/repository/id_provider_test.go
index e4371f091b..c5e9c41e06 100644
--- a/backend/v3/storage/database/repository/id_provider_test.go
+++ b/backend/v3/storage/database/repository/id_provider_test.go
@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/muhlemmer/gu"
-
 	"github.com/brianvoe/gofakeit/v6"
+	"github.com/muhlemmer/gu"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/zitadel/zitadel/backend/v3/domain"
 	"github.com/zitadel/zitadel/backend/v3/storage/database"
 	"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
@@ -173,7 +173,7 @@ func TestCreateIDProvider(t *testing.T) {
 						State:      domain.OrgStateActive.String(),
 					}
 					organizationRepo := repository.OrganizationRepository(pool)
-					err = organizationRepo.Create(t.Context(), &org)
+					err = organizationRepo.Create(ctx, &org)
 					require.NoError(t, err)
 
 					idpRepo := repository.IDProviderRepository(pool)
@@ -941,7 +941,7 @@ func TestListIDProvider(t *testing.T) {
 					State:      domain.OrgStateActive.String(),
 				}
 				organizationRepo := repository.OrganizationRepository(pool)
-				err = organizationRepo.Create(t.Context(), &org)
+				err = organizationRepo.Create(ctx, &org)
 				require.NoError(t, err)
 
 				// create idp
@@ -1005,7 +1005,7 @@ func TestListIDProvider(t *testing.T) {
 					State:      domain.OrgStateActive.String(),
 				}
 				organizationRepo := repository.OrganizationRepository(pool)
-				err = organizationRepo.Create(t.Context(), &org)
+				err = organizationRepo.Create(ctx, &org)
 				require.NoError(t, err)
 
 				// create idp
@@ -1666,7 +1666,7 @@ func TestListIDProvider(t *testing.T) {
 				require.NoError(t, err)
 			})
 
-			ctx := t.Context()
+			ctx := context.WithoutCancel(t.Context())
 
 			idps := tt.testFunc(ctx, t)
 
diff --git a/cmd/setup/transactional_tables.go b/cmd/setup/transactional_tables.go
index 293ca3fca5..ca5df0a0a8 100644
--- a/cmd/setup/transactional_tables.go
+++ b/cmd/setup/transactional_tables.go
@@ -29,4 +29,4 @@ func (mig *TransactionalTables) String() string {
 
 func (mig *TransactionalTables) Check(lastRun map[string]interface{}) bool {
 	return true
-}
\ No newline at end of file
+}
diff --git a/internal/api/grpc/admin/instance.go b/internal/api/grpc/admin/instance.go
index a7b0316ec4..38fc9ec4d8 100644
--- a/internal/api/grpc/admin/instance.go
+++ b/internal/api/grpc/admin/instance.go
@@ -29,7 +29,7 @@ func (s *Server) ListInstanceDomains(ctx context.Context, req *admin_pb.ListInst
 		return nil, err
 	}
 	return &admin_pb.ListInstanceDomainsResponse{
-		Result: instance_grpc.DomainsToPb(domains.Domains),
+		Result:        instance_grpc.DomainsToPb(domains.Domains),
 		SortingColumn: req.SortingColumn,
 		Details: object.ToListDetails(
 			domains.Count,
@@ -49,7 +49,7 @@ func (s *Server) ListInstanceTrustedDomains(ctx context.Context, req *admin_pb.L
 		return nil, err
 	}
 	return &admin_pb.ListInstanceTrustedDomainsResponse{
-		Result: instance_grpc.TrustedDomainsToPb(domains.Domains),
+		Result:        instance_grpc.TrustedDomainsToPb(domains.Domains),
 		SortingColumn: req.SortingColumn,
 		Details: object.ToListDetails(
 			domains.Count,
diff --git a/internal/command/user_v2.go b/internal/command/user_v2.go
index d6c5e7de53..5eae710e57 100644
--- a/internal/command/user_v2.go
+++ b/internal/command/user_v2.go
@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+
 	"github.com/zitadel/logging"
 
 	"github.com/zitadel/zitadel/internal/domain"