diff --git a/app/components/link-to-dep.js b/app/components/link-to-dep.js
new file mode 100644
index 00000000000..55706477346
--- /dev/null
+++ b/app/components/link-to-dep.js
@@ -0,0 +1,3 @@
+import Component from '@ember/component';
+
+export default Component.extend({});
diff --git a/app/templates/components/category-list.hbs b/app/templates/components/category-list.hbs
index aaacf8aec3c..212f96f6564 100644
--- a/app/templates/components/category-list.hbs
+++ b/app/templates/components/category-list.hbs
@@ -1,5 +1,5 @@
 <ul>
-  {{#each this.categories as |category|}}
+  {{#each @categories as |category|}}
     <li>
       <LinkTo @route="category" @model={{category.slug}} class="name">
         <span>{{ category.category }} ({{ format-num category.crates_cnt }})</span>
diff --git a/app/templates/components/crate-downloads-list.hbs b/app/templates/components/crate-downloads-list.hbs
index 6bd66d063d0..4725ca240ce 100644
--- a/app/templates/components/crate-downloads-list.hbs
+++ b/app/templates/components/crate-downloads-list.hbs
@@ -1,5 +1,5 @@
 <ul>
-  {{#each this.crates as |crate|}}
+  {{#each @crates as |crate|}}
     <li>
       <LinkTo @route="crate" @model={{crate.id}} class="name">
         {{ crate.name }} ({{ crate.max_version }})
diff --git a/app/templates/components/crate-list-name-only.hbs b/app/templates/components/crate-list-name-only.hbs
index 63be00ae384..dbf48a8cf20 100644
--- a/app/templates/components/crate-list-name-only.hbs
+++ b/app/templates/components/crate-list-name-only.hbs
@@ -1,5 +1,5 @@
 <ol>
-  {{#each this.crates as |crate index|}}
+  {{#each @crates as |crate index|}}
     <li>
       <LinkTo @route="crate" @model={{crate.id}} class="name" data-test-crate-link={{index}}>
         <span>{{ crate.name }}</span>
diff --git a/app/templates/components/crate-list-newest.hbs b/app/templates/components/crate-list-newest.hbs
index 39a7659743e..d210295c956 100644
--- a/app/templates/components/crate-list-newest.hbs
+++ b/app/templates/components/crate-list-newest.hbs
@@ -1,5 +1,5 @@
 <ol>
-  {{#each this.crates as |crate index|}}
+  {{#each @crates as |crate index|}}
     <li>
       <LinkTo @route="crate.version" @models={{array crate.id crate.newest_version}} class="name" data-test-crate-link={{index}}>
         <span>{{ crate.name }} ({{ crate.newest_version }})</span>
diff --git a/app/templates/components/keyword-list.hbs b/app/templates/components/keyword-list.hbs
index 12c0cda5435..92ef712455f 100644
--- a/app/templates/components/keyword-list.hbs
+++ b/app/templates/components/keyword-list.hbs
@@ -1,5 +1,5 @@
 <ul>
-  {{#each this.keywords as |keyword|}}
+  {{#each @keywords as |keyword|}}
     <li>
       <LinkTo @route="keyword" @model={{keyword}} class="name">
         <span>{{ keyword.id }} ({{ format-num keyword.crates_cnt }})</span>
diff --git a/app/templates/components/link-to-dep.hbs b/app/templates/components/link-to-dep.hbs
index e0f26de3ee0..c280813c885 100644
--- a/app/templates/components/link-to-dep.hbs
+++ b/app/templates/components/link-to-dep.hbs
@@ -1,6 +1,6 @@
-<LinkTo @route="crate" @model={{this.dep.crate_id}}>
-  {{ this.dep.crate_id }} {{ format-req this.dep.req }}
+<LinkTo @route="crate" @model={{@dep.crate_id}}>
+  {{ @dep.crate_id }} {{ format-req @dep.req }}
 </LinkTo>
-{{#if this.dep.optional}}
+{{#if @dep.optional}}
   <span class='optional'>optional</span>
 {{/if}}
diff --git a/config/optional-features.json b/config/optional-features.json
index ca5bbd076f8..99640545352 100644
--- a/config/optional-features.json
+++ b/config/optional-features.json
@@ -1,3 +1,4 @@
 {
-  "application-template-wrapper": false
+  "application-template-wrapper": false,
+  "template-only-glimmer-components": true
 }