diff --git a/app/templates/account.hbs b/app/templates/account.hbs
index 93a0d8f0..abfc6c97 100644
--- a/app/templates/account.hbs
+++ b/app/templates/account.hbs
@@ -73,7 +73,7 @@
 
   <div>
     <ul class="profile-hooklist">
-      {{#each hook in hooks}}
+      {{#each hooks as |hook|}}
         {{hooks-list-item hook=hook}}
       {{else}}
         <li>
@@ -92,7 +92,7 @@
       <p>You require admin rights to enable these repositories</p>
 
       <ul class="profile-hooklist">
-        {{#each hook in hooksWithoutAdmin}}
+        {{#each hooksWithoutAdmin as |hook| }}
           <li class="{{if hook.active 'active'}} row">
             <div class="switch--icon inline-block disabled {{if hook.active 'active'}}">
               <div class="switch-inner">
diff --git a/app/templates/branches.hbs b/app/templates/branches.hbs
index d423b0d8..ebbe5f7e 100644
--- a/app/templates/branches.hbs
+++ b/app/templates/branches.hbs
@@ -10,7 +10,7 @@
     <section>
       <h2 class="small-title">Active Branches</h2>
       <ul class="blank-list">
-        {{#each branch in activeBranches}}
+        {{#each activeBranches as |branch|}}
           {{branch-row build=branch}}
         {{/each}}
       </ul>
@@ -21,7 +21,7 @@
     <section>
       <h2 class="small-title">Inactive Branches</h2>
       <ul class="blank-list">
-        {{#each branch in inactiveBranches}}
+        {{#each inactiveBranches as |branch|}}
           {{branch-row build=branch inactive=true}}
         {{/each}}
       </ul>
diff --git a/app/templates/caches.hbs b/app/templates/caches.hbs
index 5500cf20..e9ef582f 100644
--- a/app/templates/caches.hbs
+++ b/app/templates/caches.hbs
@@ -8,7 +8,7 @@
   {{#if model.pushes.length}}
     <h2 class="caches-title">Pushes</h2>
     <ul id="caches" class="caches">
-      {{#each cache in model.pushes }}
+      {{#each  model.pushes as |cache|}}
         {{caches-item cache=cache repo=repo caches=model.pushes}}
       {{/each}}
     </ul>
@@ -17,7 +17,7 @@
   {{#if model.pullRequests.length}}
     <h2 class="caches-title">Pull Requests</h2>
     <ul class="caches">
-      {{#each cache in model.pullRequests }}
+      {{#each model.pullRequests as |cache|}}
         {{caches-item cache=cache repo=repo caches=model.pullRequests}}
       {{/each}}
     </ul>
diff --git a/app/templates/components/branch-row.hbs b/app/templates/components/branch-row.hbs
index 3aa513c5..4050cf0d 100644
--- a/app/templates/components/branch-row.hbs
+++ b/app/templates/components/branch-row.hbs
@@ -202,7 +202,7 @@
   {{#if getLast5Builds.isLoading}}
     {{loading-indicator center=true}}
   {{else}}
-    {{#each buildTile in getLast5Builds.content}}
+    {{#each  getLast5Builds.content as |buildTile|}}
       {{build-tile build=buildTile}}
     {{/each}}
   {{/if}}
diff --git a/app/templates/components/flash-display.hbs b/app/templates/components/flash-display.hbs
index c61c8b3f..cc35e4ef 100644
--- a/app/templates/components/flash-display.hbs
+++ b/app/templates/components/flash-display.hbs
@@ -1,3 +1,3 @@
-{{#each flash in messages}}
+{{#each messages as |flash|}}
   {{flash-item flash=flash close=(action 'closeMessage')}}
 {{/each}}
diff --git a/app/templates/components/jobs-list.hbs b/app/templates/components/jobs-list.hbs
index 5751f165..aa686c43 100644
--- a/app/templates/components/jobs-list.hbs
+++ b/app/templates/components/jobs-list.hbs
@@ -13,7 +13,7 @@
   {{/if}}
 
     <ul class="jobs-list">
-    {{#each job in jobs}}
+    {{#each jobs as |job|}}
       {{jobs-item job=job repo=repo}}
     {{/each}}
     </ul>
diff --git a/app/templates/components/orgs-filter.hbs b/app/templates/components/orgs-filter.hbs
index 41072c7c..5323e841 100644
--- a/app/templates/components/orgs-filter.hbs
+++ b/app/templates/components/orgs-filter.hbs
@@ -21,7 +21,7 @@
     {{#if selected }}
       <li><a title="" {{action 'select'}}>All organizations</a></li>
     {{/if}}
-    {{#each org in orgs}}
+    {{#each orgs as |org|}}
       <li>
         <a title="" {{action 'select' org}}><img src="{{org.avatar_url}}" alt="">
           {{#if org.name }}
diff --git a/app/templates/home.hbs b/app/templates/home.hbs
index 002770c2..f9322a87 100644
--- a/app/templates/home.hbs
+++ b/app/templates/home.hbs
@@ -52,7 +52,7 @@
 			</div>
 			<div class="medium-6 columns">
 				<ul class="tiles-landing">
-				{{#each repo in repos}}
+				{{#each repos as |repo|}}
 					<li class="db column {{repo.lastBuild.state}}">
 						<div class="db-status">
 							<span class="icon icon-status {{repo.lastBuild.state}}"></span>
diff --git a/app/templates/jobs.hbs b/app/templates/jobs.hbs
index 02045a7b..e7aef432 100644
--- a/app/templates/jobs.hbs
+++ b/app/templates/jobs.hbs
@@ -12,7 +12,7 @@
     </h2>
   {{/if}}
 
-    {{#each job in view.jobs}}
+    {{#each view.jobs as |job|}}
       {{#view 'jobs-item' context=job}}
         <div class="tile tile--jobs row {{job.state}}">
           {{#if job.config}}