diff --git a/stackit/internal/wait/postgresflexalpha/wait.go b/stackit/internal/wait/postgresflexalpha/wait.go
index dcf4365b..26f2d729 100644
--- a/stackit/internal/wait/postgresflexalpha/wait.go
+++ b/stackit/internal/wait/postgresflexalpha/wait.go
@@ -161,27 +161,27 @@ func CreateInstanceWaitHandler(
 		},
 	)
 	// Sleep before wait is set because sometimes API returns 404 right after creation request
-	// handler.SetTimeout(90 * time.Minute).SetSleepBeforeWait(30 * time.Second)
+	handler.SetTimeout(90 * time.Minute).SetSleepBeforeWait(30 * time.Second)
 	return handler
 }
 
 // PartialUpdateInstanceWaitHandler will wait for instance update
 func PartialUpdateInstanceWaitHandler(
-	ctx context.Context, a APIClientInstanceInterface, projectId, region,
-	instanceId string,
+	ctx context.Context, a APIClientInstanceInterface, projectID, region,
+	instanceID string,
 ) *wait.AsyncActionHandler[v3alpha1api.GetInstanceResponse] {
 	handler := wait.New(
 		func() (waitFinished bool, response *v3alpha1api.GetInstanceResponse, err error) {
-			s, err := a.GetInstanceRequest(ctx, projectId, region, instanceId).Execute()
+			s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute()
 			if err != nil {
 				return false, nil, err
 			}
-			if s == nil || s.Id != instanceId {
+			if s == nil || s.Id != instanceID {
 				return false, nil, nil
 			}
 			switch s.Status {
 			default:
-				return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceId, s.Status)
+				return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceID, s.Status)
 			case InstanceStateEmpty:
 				return false, nil, nil
 			case InstanceStatePending:
@@ -195,7 +195,7 @@ func PartialUpdateInstanceWaitHandler(
 			case InstanceStateUnknown:
 				return false, nil, nil
 			case InstanceStateFailed:
-				return true, s, fmt.Errorf("update got status FAILURE for instance with id %s", instanceId)
+				return true, s, fmt.Errorf("update got status FAILURE for instance with id %s", instanceID)
 			}
 		},
 	)
@@ -290,14 +290,14 @@ func GetDatabaseByIdWaitHandler(
 func DeleteInstanceWaitHandler(
 	ctx context.Context,
 	a APIClientInstanceInterface,
-	projectId,
+	projectID,
 	region,
-	instanceId string,
+	instanceID string,
 	timeout, sleepBeforeWait time.Duration,
 ) error {
 	handler := wait.New(
 		func() (waitFinished bool, response *v3alpha1api.GetInstanceResponse, err error) {
-			s, err := a.GetInstanceRequest(ctx, projectId, region, instanceId).Execute()
+			s, err := a.GetInstanceRequest(ctx, projectID, region, instanceID).Execute()
 			if err != nil {
 				oapiErr, ok := err.(*oapierror.GenericOpenAPIError) // nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
 				if !ok {
@@ -314,12 +314,14 @@ func DeleteInstanceWaitHandler(
 			case InstanceStateEmpty, InstanceStatePending, InstanceStateUnknown, InstanceStateProgressing, InstanceStateSuccess:
 				return false, nil, nil
 			case InstanceStateFailed:
-				return true, nil, fmt.Errorf("wait handler got status FAILURE for instance: %s", instanceId)
+				return true, nil, fmt.Errorf("wait handler got status FAILURE for instance: %s", instanceID)
 			default:
-				return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceId, s.Status)
+				return true, s, fmt.Errorf("instance with id %s has unexpected status %s", instanceID, s.Status)
 			}
 		},
-	).SetTimeout(timeout).SetSleepBeforeWait(sleepBeforeWait)
+	).
+		SetTimeout(timeout).
+		SetSleepBeforeWait(sleepBeforeWait)
 
 	_, err := handler.WaitWithContext(ctx)
 	if err != nil {