diff --git a/ghost/admin/app/templates/components/gh-unsplash.hbs b/ghost/admin/app/templates/components/gh-unsplash.hbs
index 836d20f493..448bfc91db 100644
--- a/ghost/admin/app/templates/components/gh-unsplash.hbs
+++ b/ghost/admin/app/templates/components/gh-unsplash.hbs
@@ -21,7 +21,7 @@
                         name="searchKeyword"
                         placeholder="Search free high-resolution photos"
                         tabindex="1"
-                        autofocus="autofocus"
+                        shouldFocus=true
                         autocorrect="off"
                         value=(readonly this.unsplash.searchTerm)
                         input=(action "search" value="target.value")
diff --git a/ghost/admin/app/templates/components/modal-invite-new-user.hbs b/ghost/admin/app/templates/components/modal-invite-new-user.hbs
index b18f319f79..0df7f0f327 100644
--- a/ghost/admin/app/templates/components/modal-invite-new-user.hbs
+++ b/ghost/admin/app/templates/components/modal-invite-new-user.hbs
@@ -16,7 +16,7 @@
                 type="email"
                 placeholder="Email Address"
                 name="email"
-                autofocus="autofocus"
+                shouldFocus=true
                 autocapitalize="off"
                 autocorrect="off"
                 value=(readonly email)
diff --git a/ghost/admin/app/templates/components/modal-webhook-form.hbs b/ghost/admin/app/templates/components/modal-webhook-form.hbs
index 15ba3e36fc..b83f10ced6 100644
--- a/ghost/admin/app/templates/components/modal-webhook-form.hbs
+++ b/ghost/admin/app/templates/components/modal-webhook-form.hbs
@@ -17,7 +17,7 @@
                 name="name"
                 class="gh-input mt1"
                 placeholder="Webhook name..."
-                autofocus="autofocus"
+                shouldFocus=true
                 autocapitalize="off"
                 autocorrect="off"
                 data-test-input="webhook-name"}}
@@ -57,7 +57,7 @@
                 name="targetUrl"
                 class="gh-input mt1"
                 placeholder="Webhook target URL..."
-                autofocus="autofocus"
+                shouldFocus=true
                 autocapitalize="off"
                 autocorrect="off"
                 data-test-input="webhook-targetUrl"}}
@@ -76,7 +76,7 @@
                     name="secret"
                     class="gh-input mt1"
                     placeholder="Webhook secret..."
-                    autofocus="autofocus"
+                    shouldFocus=true
                     autocapitalize="off"
                     autocorrect="off"
                     data-test-input="webhook-secret"}}
diff --git a/ghost/admin/app/templates/reset.hbs b/ghost/admin/app/templates/reset.hbs
index 4b81be93e0..a295d87e44 100644
--- a/ghost/admin/app/templates/reset.hbs
+++ b/ghost/admin/app/templates/reset.hbs
@@ -11,7 +11,7 @@
                             placeholder="Password"
                             class="password"
                             autocorrect="off"
-                            autofocus="autofocus"
+                            shouldFocus=true
                             value=(readonly this.newPassword)
                             input=(action (mut this.newPassword) value="target.value")}}
                     </span>
@@ -25,7 +25,7 @@
                             placeholder="Confirm Password"
                             class="password"
                             autocorrect="off"
-                            autofocus="autofocus"
+                            shouldFocus=true
                             value=(readonly this.ne2Password)
                             input=(action (mut this.ne2Password) value="target.value")}}
                     </span>
diff --git a/ghost/admin/config/deprecation-workflow.js b/ghost/admin/config/deprecation-workflow.js
index d7d20f9b97..5fbc0f0b9a 100644
--- a/ghost/admin/config/deprecation-workflow.js
+++ b/ghost/admin/config/deprecation-workflow.js
@@ -2,12 +2,6 @@ self.deprecationWorkflow = self.deprecationWorkflow || {};
 self.deprecationWorkflow.config = {
     workflow: [
         {handler: 'silence', matchId: 'ember-views.curly-components.jquery-element'},
-        {handler: 'silence', matchId: 'computed-property.override'},
-        {handler: 'silence', matchId: 'application-controller.router-properties'},
-        {handler: 'silence', matchId: 'events.remove-all-listeners'},
-        {handler: 'silence', matchId: 'ember-polyfills.deprecate-merge'},
-        {handler: 'silence', matchId: 'events.inherited-function-listeners'},
-        {handler: 'silence', matchId: 'ember-component.send-action'},
         // revert once ember-infinity removes usage of `isVisible`
         // https://github.com/ember-infinity/ember-infinity/pull/399
         {handler: 'silence', matchId: 'ember-component.is-visible'}