diff --git a/apps/api/project.json b/apps/api/project.json
index c4c3d2221..b9940f9b0 100644
--- a/apps/api/project.json
+++ b/apps/api/project.json
@@ -66,6 +66,7 @@
                 "generate",
                 "build-console"
             ],
+            "cache": true,
             "command": "bash -c 'CGO_ENABLED=0 go build -o .artifacts/bin/$(go env GOOS)/$(go env GOARCH)/zitadel.local -ldflags=\"-s -w\"'",
             "inputs": [
                 {
@@ -89,6 +90,7 @@
                 "generate",
                 "build-console"
             ],
+            "cache": true,
             "command": "bash -c 'CGO_ENABLED=0 GOOS=linux go build -o .artifacts/bin/linux/$(go env GOARCH)/zitadel.local -ldflags=\"-s -w\"'",
             "inputs": [
                 {
@@ -161,6 +163,7 @@
             "dependsOn": [
                 "generate"
             ],
+            "cache": true,
             "command": "go test -race -coverprofile=profile.api.test-unit.cov -coverpkg=./internal/...,./backend/...  ./...",
             "inputs": [
                 "sources",
diff --git a/internal/api/grpc/oidc/v2/integration_test/oidc_test.go b/internal/api/grpc/oidc/v2/integration_test/oidc_test.go
index 57664af9d..6771cb18a 100644
--- a/internal/api/grpc/oidc/v2/integration_test/oidc_test.go
+++ b/internal/api/grpc/oidc/v2/integration_test/oidc_test.go
@@ -752,13 +752,14 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) {
 					req, err := Instance.CreateDeviceAuthorizationRequest(CTXLoginClient, client.GetClientId(), "openid")
 					require.NoError(t, err)
 					var id string
-					assert.EventuallyWithT(t, func(collectT *assert.CollectT) {
+					retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTXLoginClient, time.Minute)
+					require.EventuallyWithT(t, func(collectT *assert.CollectT) {
 						resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{
 							UserCode: req.UserCode,
 						})
 						assert.NoError(collectT, err)
 						id = resp.GetDeviceAuthorizationRequest().GetId()
-					}, 5*time.Second, 100*time.Millisecond)
+					}, retryDuration, tick)
 					return id
 				}(),
 				Decision: &oidc_pb.AuthorizeOrDenyDeviceAuthorizationRequest_Session{
@@ -778,13 +779,14 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) {
 					req, err := Instance.CreateDeviceAuthorizationRequest(CTXLoginClient, client.GetClientId(), "openid")
 					require.NoError(t, err)
 					var id string
-					assert.EventuallyWithT(t, func(collectT *assert.CollectT) {
+					retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTXLoginClient, time.Minute)
+					require.EventuallyWithT(t, func(collectT *assert.CollectT) {
 						resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{
 							UserCode: req.UserCode,
 						})
 						assert.NoError(collectT, err)
 						id = resp.GetDeviceAuthorizationRequest().GetId()
-					}, 5*time.Second, 100*time.Millisecond)
+					}, retryDuration, tick)
 					return id
 				}(),
 				Decision: &oidc_pb.AuthorizeOrDenyDeviceAuthorizationRequest_Session{
@@ -804,13 +806,14 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) {
 					req, err := Instance.CreateDeviceAuthorizationRequest(CTXLoginClient, client.GetClientId(), "openid")
 					require.NoError(t, err)
 					var id string
-					assert.EventuallyWithT(t, func(collectT *assert.CollectT) {
+					retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTXLoginClient, time.Minute)
+					require.EventuallyWithT(t, func(collectT *assert.CollectT) {
 						resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{
 							UserCode: req.UserCode,
 						})
 						assert.NoError(collectT, err)
 						id = resp.GetDeviceAuthorizationRequest().GetId()
-					}, 5*time.Second, 100*time.Millisecond)
+					}, retryDuration, tick)
 					return id
 				}(),
 				Decision: &oidc_pb.AuthorizeOrDenyDeviceAuthorizationRequest_Deny{},
@@ -826,13 +829,14 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) {
 					req, err := Instance.CreateDeviceAuthorizationRequest(CTXLoginClient, client.GetClientId(), "openid")
 					require.NoError(t, err)
 					var id string
-					assert.EventuallyWithT(t, func(collectT *assert.CollectT) {
+					retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTXLoginClient, time.Minute)
+					require.EventuallyWithT(t, func(collectT *assert.CollectT) {
 						resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{
 							UserCode: req.UserCode,
 						})
 						assert.NoError(collectT, err)
 						id = resp.GetDeviceAuthorizationRequest().GetId()
-					}, 5*time.Second, 100*time.Millisecond)
+					}, retryDuration, tick)
 					return id
 				}(),
 				Decision: &oidc_pb.AuthorizeOrDenyDeviceAuthorizationRequest_Deny{},
@@ -848,13 +852,14 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) {
 					req, err := Instance.CreateDeviceAuthorizationRequest(CTXLoginClient, client.GetClientId(), "openid")
 					require.NoError(t, err)
 					var id string
-					assert.EventuallyWithT(t, func(collectT *assert.CollectT) {
+					retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTXLoginClient, time.Minute)
+					require.EventuallyWithT(t, func(collectT *assert.CollectT) {
 						resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{
 							UserCode: req.UserCode,
 						})
 						assert.NoError(collectT, err)
 						id = resp.GetDeviceAuthorizationRequest().GetId()
-					}, 5*time.Second, 100*time.Millisecond)
+					}, retryDuration, tick)
 					return id
 				}(),
 				Decision: &oidc_pb.AuthorizeOrDenyDeviceAuthorizationRequest_Session{
@@ -874,13 +879,14 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) {
 					req, err := Instance.CreateDeviceAuthorizationRequest(CTXLoginClient, client.GetClientId(), "openid")
 					require.NoError(t, err)
 					var id string
-					assert.EventuallyWithT(t, func(collectT *assert.CollectT) {
+					retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTXLoginClient, time.Minute)
+					require.EventuallyWithT(t, func(collectT *assert.CollectT) {
 						resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{
 							UserCode: req.UserCode,
 						})
 						assert.NoError(collectT, err)
 						id = resp.GetDeviceAuthorizationRequest().GetId()
-					}, 5*time.Second, 100*time.Millisecond)
+					}, retryDuration, tick)
 					return id
 				}(),
 				Decision: &oidc_pb.AuthorizeOrDenyDeviceAuthorizationRequest_Session{
diff --git a/internal/command/user_v2_human_test.go b/internal/command/user_v2_human_test.go
index f16f594fc..9c1459097 100644
--- a/internal/command/user_v2_human_test.go
+++ b/internal/command/user_v2_human_test.go
@@ -2711,6 +2711,7 @@ func TestCommandSide_ChangeUserHuman(t *testing.T) {
 					),
 				),
 				checkPermission: newMockPermissionCheckNotAllowed(),
+				loginPaths:      expectLoginPathsNoCall,
 				tarpit:          expectTarpit(0),
 			},
 			args: args{
@@ -3060,6 +3061,7 @@ func TestCommandSide_ChangeUserHuman(t *testing.T) {
 					),
 				),
 				checkPermission: newMockPermissionCheckNotAllowed(),
+				loginPaths:      expectLoginPathsNoCall,
 				tarpit:          expectTarpit(0),
 			},
 			args: args{