diff --git a/app/views/boards/_board.json.jbuilder b/app/views/boards/_board.json.jbuilder
index 7723f6aae..fd4e891d7 100644
--- a/app/views/boards/_board.json.jbuilder
+++ b/app/views/boards/_board.json.jbuilder
@@ -3,7 +3,5 @@ json.cache! board do
   json.created_at board.created_at.utc
   json.url board_url(board)
 
-  json.creator do
-    json.partial! "users/user", user: board.creator
-  end
+  json.creator board.creator, partial: "users/user", as: :user
 end
diff --git a/app/views/cards/_card.json.jbuilder b/app/views/cards/_card.json.jbuilder
index 77422c05c..a1c509a66 100644
--- a/app/views/cards/_card.json.jbuilder
+++ b/app/views/cards/_card.json.jbuilder
@@ -12,17 +12,9 @@ json.cache! card do
 
   json.url card_url(card)
 
-  json.board do
-    json.partial! "boards/board", locals: { board: card.board }
-  end
-
-  json.column do
-    json.partial! "columns/column", column: card.column if card.column
-  end
-
-  json.creator do
-    json.partial! "users/user", user: card.creator
-  end
+  json.board card.board, partial: "boards/board", as: :board
+  json.column card.column, partial: "columns/column", as: :column if card.column
+  json.creator card.creator, partial: "users/user", as: :user
 
   json.comments_url card_comments_url(card)
 end
diff --git a/app/views/cards/comments/_comment.json.jbuilder b/app/views/cards/comments/_comment.json.jbuilder
index a66ae1ef9..3eb9855ed 100644
--- a/app/views/cards/comments/_comment.json.jbuilder
+++ b/app/views/cards/comments/_comment.json.jbuilder
@@ -9,9 +9,7 @@ json.cache! comment do
     json.html comment.body.to_s
   end
 
-  json.creator do
-    json.partial! "users/user", user: comment.creator
-  end
+  json.creator comment.creator, partial: "users/user", as: :user
 
   json.reactions_url card_comment_reactions_url(comment.card_id, comment.id)
   json.url card_comment_url(comment.card_id, comment.id)
diff --git a/app/views/cards/comments/reactions/_reaction.json.jbuilder b/app/views/cards/comments/reactions/_reaction.json.jbuilder
index e83dd3e4d..17ad70f70 100644
--- a/app/views/cards/comments/reactions/_reaction.json.jbuilder
+++ b/app/views/cards/comments/reactions/_reaction.json.jbuilder
@@ -1,7 +1,5 @@
 json.cache! reaction do
   json.(reaction, :id, :content)
-  json.reacter do
-    json.partial! "users/user", user: reaction.reacter
-  end
+  json.reacter reaction.reacter, partial: "users/user", as: :user
   json.url card_comment_reaction_url(reaction.comment.card, reaction.comment, reaction)
 end
diff --git a/app/views/cards/show.json.jbuilder b/app/views/cards/show.json.jbuilder
index 225bded6f..0ed9bd1ad 100644
--- a/app/views/cards/show.json.jbuilder
+++ b/app/views/cards/show.json.jbuilder
@@ -1,7 +1,2 @@
 json.partial! "cards/card", card: @card
-
-json.steps do
-  json.array! @card.steps do |step|
-    json.partial! "steps/step", step: step
-  end
-end
+json.steps @card.steps, partial: "steps/step", as: :step
diff --git a/app/views/my/identities/show.json.jbuilder b/app/views/my/identities/show.json.jbuilder
index 3d4ee1750..a36569e41 100644
--- a/app/views/my/identities/show.json.jbuilder
+++ b/app/views/my/identities/show.json.jbuilder
@@ -1,6 +1,4 @@
 json.accounts @identity.users do |user|
   json.partial! "my/identities/account", account: user.account
-  json.user do
-    json.partial! "users/user", user: user
-  end
+  json.user user, partial: "users/user", as: :user
 end
diff --git a/app/views/notifications/_notification.json.jbuilder b/app/views/notifications/_notification.json.jbuilder
index 14b92cc42..ba27c5425 100644
--- a/app/views/notifications/_notification.json.jbuilder
+++ b/app/views/notifications/_notification.json.jbuilder
@@ -6,9 +6,7 @@ json.cache! notification do
 
   json.partial! "notifications/notification/#{notification.source_type.underscore}/body", notification: notification
 
-  json.creator do
-    json.partial! "users/user", user: notification.creator
-  end
+  json.creator notification.creator, partial: "users/user", as: :user
 
   json.card do
     json.(notification.card, :id, :title, :status)
diff --git a/app/views/webhooks/event.json.jbuilder b/app/views/webhooks/event.json.jbuilder
index b7ce90dcd..2f4f817d8 100644
--- a/app/views/webhooks/event.json.jbuilder
+++ b/app/views/webhooks/event.json.jbuilder
@@ -9,11 +9,6 @@ json.cache! @event do
     end
   end
 
-  json.board do
-    json.partial! "boards/board", locals: { board: @event.board }
-  end
-
-  json.creator do
-    json.partial! "users/user", user: @event.creator
-  end
+  json.board @event.board, partial: "boards/board", as: :board
+  json.creator @event.creator, partial: "users/user", as: :user
 end