diff --git a/stackit/internal/services/postgresflexalpha/database/functions.go b/stackit/internal/services/postgresflexalpha/database/functions.go
index 4496faa1..e67f4926 100644
--- a/stackit/internal/services/postgresflexalpha/database/functions.go
+++ b/stackit/internal/services/postgresflexalpha/database/functions.go
@@ -59,7 +59,7 @@ func getDatabase(
 
 	for page := int32(1); ; page++ {
 		res, err := client.ListDatabasesRequest(ctx, projectId, region, instanceId).
-			Page(page).Size(pageSize).Sort(postgresflex.DATABASESORT_INDEX_ASC).Execute()
+			Page(page).Size(pageSize).Sort(postgresflex.DATABASESORT_DATABASE_ID_ASC).Execute()
 		if err != nil {
 			return nil, fmt.Errorf("requesting database list (page %d): %w", page, err)
 		}
diff --git a/stackit/internal/services/postgresflexalpha/flavor/functions.go b/stackit/internal/services/postgresflexalpha/flavor/functions.go
index 5a631bc7..67c7f9fa 100644
--- a/stackit/internal/services/postgresflexalpha/flavor/functions.go
+++ b/stackit/internal/services/postgresflexalpha/flavor/functions.go
@@ -44,7 +44,7 @@ func getFlavorsByFilter(
 
 	for page := int32(1); ; page++ {
 		res, err := client.GetFlavorsRequest(ctx, projectId, region).
-			Page(page).Size(pageSize).Sort(postgresflex.FLAVORSORT_INDEX_ASC).Execute()
+			Page(page).Size(pageSize).Sort(postgresflex.FLAVORSORT_ID_ASC).Execute()
 		if err != nil {
 			return nil, fmt.Errorf("requesting flavors list (page %d): %w", page, err)
 		}