diff --git a/app/templates/about/legal.hbs b/app/templates/about/legal.hbs
index 0120b9f22..66fe63242 100644
--- a/app/templates/about/legal.hbs
+++ b/app/templates/about/legal.hbs
@@ -1,4 +1,4 @@
-{{title "Legal"}}
+{{page-title "Legal"}}
 <section class="container" aria-labelledby="legal">
   <h1 id="legal">Legal</h1>
   <p>
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index d3e8d0702..272a99408 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -1,5 +1,5 @@
 <HeadLayout />
-{{title "Ember.js"}}
+{{page-title "Ember.js"}}
 
 <BlackLivesMatterBanner />
 <EmberSurvey />
diff --git a/app/templates/community.hbs b/app/templates/community.hbs
index d73e56f80..2b24faab4 100644
--- a/app/templates/community.hbs
+++ b/app/templates/community.hbs
@@ -1,3 +1,3 @@
-{{title "Community"}}
+{{page-title "Community"}}
 
 {{outlet}}
diff --git a/app/templates/community/meetups-getting-started.hbs b/app/templates/community/meetups-getting-started.hbs
index 8c1490fa9..41f016e1d 100644
--- a/app/templates/community/meetups-getting-started.hbs
+++ b/app/templates/community/meetups-getting-started.hbs
@@ -1,4 +1,4 @@
-{{title "Getting Started"}}
+{{page-title "Getting Started"}}
 <section class="container" aria-labelledby="getting-your-meetup-up-and-running">
   <h1 id="getting-your-meetup-up-and-running">
     Getting Your Meetup Up and Running
diff --git a/app/templates/community/meetups/assets.hbs b/app/templates/community/meetups/assets.hbs
index 916783e3b..246158045 100644
--- a/app/templates/community/meetups/assets.hbs
+++ b/app/templates/community/meetups/assets.hbs
@@ -1,4 +1,4 @@
-{{title "Assets"}}
+{{page-title "Assets"}}
 <section class="container" aria-labelledby="ember-meetup-resources">
   <h1 id="ember-meetup-resources">
     Ember Meetup Resources
diff --git a/app/templates/community/meetups/index.hbs b/app/templates/community/meetups/index.hbs
index 6e3da795d..dc5684cd8 100644
--- a/app/templates/community/meetups/index.hbs
+++ b/app/templates/community/meetups/index.hbs
@@ -1,4 +1,4 @@
-{{title "Meetups"}}
+{{page-title "Meetups"}}
 <div class="container">
   <h1 class="mb-3">Meetups Around the World</h1>
 
diff --git a/app/templates/editions/index.hbs b/app/templates/editions/index.hbs
index bb505b50d..787591378 100644
--- a/app/templates/editions/index.hbs
+++ b/app/templates/editions/index.hbs
@@ -1,4 +1,4 @@
-{{title "Editions"}}
+{{page-title "Editions"}}
 <section class="container" aria-labelledby="ember-editions">
   <h1 id="ember-editions">Ember Editions</h1>
   <p>
diff --git a/app/templates/editions/octane.hbs b/app/templates/editions/octane.hbs
index 43be9afaf..53f4162f3 100644
--- a/app/templates/editions/octane.hbs
+++ b/app/templates/editions/octane.hbs
@@ -1,5 +1,5 @@
-{{title "Editions"}}
-{{title "Octane"}}
+{{page-title "Editions"}}
+{{page-title "Octane"}}
 
 <section class="container" aria-labelledby="octane-edition">
   <h1>The Octane Edition of Ember</h1>
diff --git a/app/templates/ember-community-survey-2016.hbs b/app/templates/ember-community-survey-2016.hbs
index ccacd5d80..d1ed268f1 100644
--- a/app/templates/ember-community-survey-2016.hbs
+++ b/app/templates/ember-community-survey-2016.hbs
@@ -1,4 +1,4 @@
-{{title "Community Survey 2016"}}
+{{page-title "Community Survey 2016"}}
 <div class="bg-dark bg-shape-boxes">
   <div class="container survey-header survey-container">
 
diff --git a/app/templates/ember-community-survey-2017.hbs b/app/templates/ember-community-survey-2017.hbs
index 89d282def..e9fad8d8f 100644
--- a/app/templates/ember-community-survey-2017.hbs
+++ b/app/templates/ember-community-survey-2017.hbs
@@ -1,4 +1,4 @@
-{{title "Community Survey 2017"}}
+{{page-title "Community Survey 2017"}}
 <div class="bg-dark bg-shape-boxes">
   <div class="container">
 
diff --git a/app/templates/ember-community-survey-2018.hbs b/app/templates/ember-community-survey-2018.hbs
index 4230b36cc..a79d46309 100644
--- a/app/templates/ember-community-survey-2018.hbs
+++ b/app/templates/ember-community-survey-2018.hbs
@@ -1,4 +1,4 @@
-{{title "Community Survey 2018"}}
+{{page-title "Community Survey 2018"}}
 <div class="bg-dark bg-shape-boxes">
   <div class="container">
 
diff --git a/app/templates/ember-community-survey-2019.hbs b/app/templates/ember-community-survey-2019.hbs
index 97524ba02..1c07b2392 100644
--- a/app/templates/ember-community-survey-2019.hbs
+++ b/app/templates/ember-community-survey-2019.hbs
@@ -1,4 +1,4 @@
-{{title "Community Survey 2019"}}
+{{page-title "Community Survey 2019"}}
 <div class="bg-dark bg-shape-boxes">
   <div class="container">
     <h1>
diff --git a/app/templates/ember-community-survey-2020.hbs b/app/templates/ember-community-survey-2020.hbs
index 7886fd97b..fd6c82681 100644
--- a/app/templates/ember-community-survey-2020.hbs
+++ b/app/templates/ember-community-survey-2020.hbs
@@ -1,4 +1,4 @@
-{{title "Community Survey 2020"}}
+{{page-title "Community Survey 2020"}}
 
 <div class="bg-dark bg-shape-boxes">
   <div class="container">
diff --git a/app/templates/ember-users.hbs b/app/templates/ember-users.hbs
index 0f742460c..2a7ac7373 100644
--- a/app/templates/ember-users.hbs
+++ b/app/templates/ember-users.hbs
@@ -1,4 +1,4 @@
-{{title "Who's Using Ember.js"}}
+{{page-title "Who's Using Ember.js"}}
 <section class="container" aria-labelledby="ember-users">
   <div class="layout">
     <div class="lg:col-4 lg:start-2 text-center text-muted mb-5">
diff --git a/app/templates/guidelines.hbs b/app/templates/guidelines.hbs
index 8a496fc0d..0b5e3591a 100644
--- a/app/templates/guidelines.hbs
+++ b/app/templates/guidelines.hbs
@@ -1,4 +1,4 @@
-{{title "Community Guidelines"}}
+{{page-title "Community Guidelines"}}
 <div class="container layout">
   <section class="lg:col-5" aria-labelledby="guidelines">
     <h1 id="guidelines">Ember Community Guidelines</h1>
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 0b4dc07dc..6d4eaeea1 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -1,4 +1,4 @@
-{{title "Ember.js - A framework for ambitious web developers" replace=true}}
+{{page-title "Ember.js - A framework for ambitious web developers" replace=true}}
 
 <section aria-labelledby="hero-title" class="bg-shape-boxes-bottom bg-dark">
   <div class="container layout">
diff --git a/app/templates/learn/index.hbs b/app/templates/learn/index.hbs
index 21684fdf1..33bca99ed 100644
--- a/app/templates/learn/index.hbs
+++ b/app/templates/learn/index.hbs
@@ -1,4 +1,4 @@
-{{title "Learn"}}
+{{page-title "Learn"}}
 <div class="container" aria-labelledby="learning-emberjs">
   <h1 id="learning-emberjs">Learning Ember.js</h1>
 
diff --git a/app/templates/logos.hbs b/app/templates/logos.hbs
index e9287ee40..641518fbd 100644
--- a/app/templates/logos.hbs
+++ b/app/templates/logos.hbs
@@ -1,4 +1,4 @@
-{{title "Branding"}}
+{{page-title "Branding"}}
 <div class="container">
   <h1>Branding</h1>
 
diff --git a/app/templates/mascots/index.hbs b/app/templates/mascots/index.hbs
index 78f82d9af..19445aa97 100644
--- a/app/templates/mascots/index.hbs
+++ b/app/templates/mascots/index.hbs
@@ -1,4 +1,4 @@
-{{title "Mascots"}}
+{{page-title "Mascots"}}
 <section aria-label="Mascots" class="container">
   <h1>Tomster and Zoey</h1>
   <p>
diff --git a/app/templates/releases.hbs b/app/templates/releases.hbs
index 19a06232f..325bc3e9c 100644
--- a/app/templates/releases.hbs
+++ b/app/templates/releases.hbs
@@ -1,4 +1,4 @@
-{{title "Releases"}}
+{{page-title "Releases"}}
 <div class="container">
   {{outlet}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/releases/beta.hbs b/app/templates/releases/beta.hbs
index 6e8e35de0..0a0a045ba 100644
--- a/app/templates/releases/beta.hbs
+++ b/app/templates/releases/beta.hbs
@@ -1,4 +1,4 @@
-{{title "Beta"}}
+{{page-title "Beta"}}
 
 <ProjectListing
     @channel="beta"
diff --git a/app/templates/releases/canary.hbs b/app/templates/releases/canary.hbs
index 809095911..28fa0a8b2 100644
--- a/app/templates/releases/canary.hbs
+++ b/app/templates/releases/canary.hbs
@@ -1,4 +1,4 @@
-{{title "Canary"}}
+{{page-title "Canary"}}
 
 <h1 class="project-name">{{capitalize "canary"}} Channel</h1>
 
diff --git a/app/templates/releases/lts.hbs b/app/templates/releases/lts.hbs
index ec16e2300..1aeb1f7d1 100644
--- a/app/templates/releases/lts.hbs
+++ b/app/templates/releases/lts.hbs
@@ -1,4 +1,4 @@
-{{title "LTS"}}
+{{page-title "LTS"}}
 
 <ProjectListing
   @projects={{array @model}}
diff --git a/app/templates/releases/release.hbs b/app/templates/releases/release.hbs
index 842e68cbb..2f0d96ad6 100644
--- a/app/templates/releases/release.hbs
+++ b/app/templates/releases/release.hbs
@@ -1,4 +1,4 @@
-{{title "Stable"}}
+{{page-title "Stable"}}
 
 <ProjectListing
   @projects={{array @model.ember @model.emberData}}
diff --git a/app/templates/security.hbs b/app/templates/security.hbs
index a9e37e816..82fd48be7 100644
--- a/app/templates/security.hbs
+++ b/app/templates/security.hbs
@@ -1,4 +1,4 @@
-{{title "Security"}}
+{{page-title "Security"}}
 <div class="container layout">
   <section class="lg:col-5" aria-labelledby="section-reporting-a-bug">
     <h1>Ember.js Security Policy</h1>
diff --git a/app/templates/sponsors.hbs b/app/templates/sponsors.hbs
index 7c769240f..c9baf1906 100644
--- a/app/templates/sponsors.hbs
+++ b/app/templates/sponsors.hbs
@@ -1,4 +1,4 @@
-{{title "Sponsors"}}
+{{page-title "Sponsors"}}
 <section class="container" aria-labelledby="ember-sponsors-and-friends">
   <h1 id="ember-sponsors-and-friends">
     Ember Sponsors and Friends
diff --git a/app/templates/team.hbs b/app/templates/team.hbs
index 8aa51a893..4ba474985 100644
--- a/app/templates/team.hbs
+++ b/app/templates/team.hbs
@@ -1,4 +1,4 @@
-{{title "Team"}}
+{{page-title "Team"}}
 <div class="container">
   <h1 class="text-center">The Team Behind Ember</h1>
   <section class="mb-3" aria-labelledby="team-detail">