diff --git a/store/postgres/asset_repository.go b/store/postgres/asset_repository.go
index 1610843d..a19e1f7c 100644
--- a/store/postgres/asset_repository.go
+++ b/store/postgres/asset_repository.go
@@ -605,17 +605,17 @@ func (r *AssetRepository) buildSQL(builder sq.SelectBuilder) (query string, args
 
 func (r *AssetRepository) getAssetSQL() sq.SelectBuilder {
 	return sq.Select(`
-		a.id as "id",
-		a.urn as "urn",
-		a.type as "type",
-		a.name as "name",
-		a.service as"service",
-		a.description as "description",
-		a.data as "data",
-		a.labels as "labels",
-		a.version as "version",
-		a.created_at as "created_at",
-		a.updated_at as "updated_at",
+		a.id as id,
+		a.urn as urn,
+		a.type as type,
+		a.name as name,
+		a.service as service,
+		a.description as description,
+		a.data as data,
+		a.labels as labels,
+		a.version as version,
+		a.created_at as created_at,
+		a.updated_at as updated_at,
 		u.id as "updated_by.id",
 		u.email as "updated_by.email",
 		u.provider as "updated_by.provider",
@@ -628,19 +628,19 @@ func (r *AssetRepository) getAssetSQL() sq.SelectBuilder {
 
 func (r *AssetRepository) getAssetVersionSQL() sq.SelectBuilder {
 	return sq.Select(`
-		a.asset_id as "id",
-		a.urn as "urn",
-		a.type as "type",
-		a.name as "name",
-		a.service as"service",
-		a.description as "description",
-		a.data as "data",
-		a.labels as "labels",
-		a.version as "version",
-		a.created_at as "created_at",
-		a.updated_at as "updated_at",
-		a.changelog as "changelog",
-		a.owners as "owners",
+		a.asset_id as id,
+		a.urn as urn,
+		a.type as type,
+		a.name as name,
+		a.service as service,
+		a.description as description,
+		a.data as data,
+		a.labels as labels,
+		a.version as version,
+		a.created_at as created_at,
+		a.updated_at as updated_at,
+		a.changelog as changelog,
+		a.owners as owners,
 		u.id as "updated_by.id",
 		u.email as "updated_by.email",
 		u.provider as "updated_by.provider",
diff --git a/store/postgres/star_repository.go b/store/postgres/star_repository.go
index 5aba023d..e05ce248 100644
--- a/store/postgres/star_repository.go
+++ b/store/postgres/star_repository.go
@@ -125,12 +125,20 @@ func (r *StarRepository) GetAllAssetsByUserID(ctx context.Context, cfg star.Conf
 			a.description as description,
 			a.data as data,
 			a.labels as labels,
+			a.version as version,
 			a.created_at as created_at,
-			a.updated_at as updated_at
+			a.updated_at as updated_at,
+			u.id as "updated_by.id",
+			u.email as "updated_by.email",
+			u.provider as "updated_by.provider",
+			u.created_at as "updated_by.created_at",
+			u.updated_at as "updated_by.updated_at"
 		FROM
 			stars s
-		JOIN
+		INNER JOIN
 			assets a ON s.asset_id = a.id
+		LEFT JOIN
+			users u ON a.updated_by = u.id
 		WHERE
 			s.user_id = $1
 		ORDER BY
@@ -174,12 +182,20 @@ func (r *StarRepository) GetAllAssetsByUserEmail(ctx context.Context, cfg star.C
 			a.description as description,
 			a.data as data,
 			a.labels as labels,
+			a.version as version,
 			a.created_at as created_at,
-			a.updated_at as updated_at
+			a.updated_at as updated_at,
+			ub.id as "updated_by.id",
+			ub.email as "updated_by.email",
+			ub.provider as "updated_by.provider",
+			ub.created_at as "updated_by.created_at",
+			ub.updated_at as "updated_by.updated_at"
 		FROM
 			stars s
 		INNER JOIN
 			assets a ON s.asset_id = a.id
+		LEFT JOIN
+			users ub ON a.updated_by = ub.id
 		INNER JOIN
 			users u ON s.user_id = u.id
 		WHERE
@@ -232,12 +248,20 @@ func (r *StarRepository) GetAssetByUserID(ctx context.Context, userID string, as
 			a.description,
 			a.data,
 			a.labels,
+			a.version,
 			a.created_at,
-			a.updated_at
+			a.updated_at,
+			u.id as "updated_by.id",
+			u.email as "updated_by.email",
+			u.provider as "updated_by.provider",
+			u.created_at as "updated_by.created_at",
+			u.updated_at as "updated_by.updated_at"
 		FROM
 			stars s
-		JOIN
+		INNER JOIN
 			assets a ON s.asset_id = a.id
+		LEFT JOIN
+			users u ON a.updated_by = u.id
 		WHERE
 			s.user_id = $1 AND s.asset_id = $2
 		LIMIT 1