diff --git a/stackit/internal/services/postgresflexalpha/database/mapper.go b/stackit/internal/services/postgresflexalpha/database/mapper.go
index 69830e45..2fa33645 100644
--- a/stackit/internal/services/postgresflexalpha/database/mapper.go
+++ b/stackit/internal/services/postgresflexalpha/database/mapper.go
@@ -34,7 +34,7 @@ func mapFields(
 
 	model.Id = types.Int64Value(databaseId)
 	model.DatabaseID = types.Int64Value(databaseId)
-	model.Name = types.StringPointerValue(source.Name)
+	model.Name = types.StringValue(source.GetName())
 	model.Owner = types.StringPointerValue(cleanString(source.Owner))
 	model.Region = types.StringValue(region)
 
@@ -64,7 +64,7 @@ func mapResourceFields(source *postgresflexalpha.ListDatabase, model *ResourceMo
 
 	model.Id = types.Int64Value(databaseId)
 	model.DatabaseID = types.Int64Value(databaseId)
-	model.Name = types.StringPointerValue(source.Name)
+	model.Name = types.StringValue(source.GetName())
 	model.Owner = types.StringPointerValue(cleanString(source.Owner))
 	return nil
 }