diff --git a/app/views/shipit/commits/_commit.html.erb b/app/views/shipit/commits/_commit.html.erb
index 05f205f86..89545df5d 100644
--- a/app/views/shipit/commits/_commit.html.erb
+++ b/app/views/shipit/commits/_commit.html.erb
@@ -4,7 +4,7 @@
       <%= render 'shipit/shared/author', author: commit.author %>
     <% end %>
 
-    <%= render commit.status %>
+    <%= render 'shipit/statuses/status', status: commit.status %>
     <div class="commit-details">
       <span class="commit-title"><%= render_commit_message_with_link commit %></span>
       <p class="commit-meta">
diff --git a/app/views/shipit/stacks/show.html.erb b/app/views/shipit/stacks/show.html.erb
index e866260a7..35035830b 100644
--- a/app/views/shipit/stacks/show.html.erb
+++ b/app/views/shipit/stacks/show.html.erb
@@ -36,7 +36,7 @@
         <h2>Previous Deploys</h2>
       </header>
       <ul class="commit-list">
-        <%= render @tasks %>
+        <%= render partial: 'shipit/tasks/task', collection: @tasks %>
       </ul>
     </section>
   <% end %>