diff --git a/.eslintrc b/.eslintrc
index e05e8de173c..8706c9f23d5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,8 @@
 {
   "extends": "eslint-config-discourse",
   "rules": {
-    "discourse-ember/global-ember": 2
+    "discourse-ember/global-ember": 2,
+    "eol-last": 2
   },
   "globals": {
     "moduleFor": "off",
diff --git a/.template-lintrc.js b/.template-lintrc.js
index 9148dda21f3..66890f87ba3 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -2,12 +2,10 @@ module.exports = {
   extends: "recommended",
   ignore: ["**/*.raw"],
 
-  // Pending:
-  // "eol-last": "always",
-
   rules: {
     "block-indentation": true,
     "deprecated-render-helper": true,
+    "eol-last": "always",
     "linebreak-style": true,
     "link-rel-noopener": "strict",
     "no-abstract-roles": true,
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
index 4d96755ff9c..de106adfd8c 100644
--- a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
@@ -2,4 +2,4 @@
   type="checkbox"
   checked=checked
   click=(action "onChange")
-}}
\ No newline at end of file
+}}
diff --git a/app/assets/javascripts/admin/addon/templates/user-fields.hbs b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
index ed0c5ba7443..a14119e92bb 100644
--- a/app/assets/javascripts/admin/addon/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
@@ -21,4 +21,4 @@
              label="admin.user_fields.create"
              icon="plus"}}
 
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
index 6e115b27b05..43253651bc6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
@@ -25,4 +25,4 @@
       title=fullscreenTitle
       ariaLabel=fullscreenTitle}}
   {{/unless}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
index af83ebbb103..fa23799d612 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
@@ -4,4 +4,4 @@
       {{message}}
     </div>
   </div>
-{{/unless}}
\ No newline at end of file
+{{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
index d7eb83adb98..2285c9ee336 100644
--- a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
@@ -1 +1 @@
-{{tagRecord.id}}
\ No newline at end of file
+{{tagRecord.id}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
index 21ae5a3cd61..530ead3e8a4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
@@ -13,4 +13,4 @@
       {{/if}}
     </h3>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs b/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
index 0186225acd2..617ffe7a35d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
@@ -2,4 +2,4 @@
   <a href={{rootUrl}} aria-live="polite">
     {{d-icon "redo"}} {{html-safe (i18n "software_update_prompt")}}
   </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/invites.hbs b/app/assets/javascripts/discourse/app/templates/invites.hbs
index e2147cab02d..c24cd68950a 100644
--- a/app/assets/javascripts/discourse/app/templates/invites.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{outlet}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
index fdf231d1308..19f54b2c0e9 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
@@ -54,4 +54,4 @@
                disabled=submitDisabled
                label="topic.slow_mode_update.remove"}}
   {{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index 66e2a81afe8..d83d631611c 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -104,4 +104,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-{{save-controls model=model action=(action "save") saved=saved}}
\ No newline at end of file
+{{save-controls model=model action=(action "save") saved=saved}}
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
index 51a1f5a1b66..937ff10b870 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
@@ -1,3 +1,3 @@
 <div class="tag-group-content">
   <p class="about">{{i18n "tagging.groups.about"}}</p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags.hbs b/app/assets/javascripts/discourse/app/templates/tags.hbs
index 471f92ae13c..f1017e67587 100644
--- a/app/assets/javascripts/discourse/app/templates/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags.hbs
@@ -1,3 +1,3 @@
 {{#d-section pageClass="tags" tagName=""}}
   {{outlet}}
-{{/d-section}}
\ No newline at end of file
+{{/d-section}}