diff --git a/app/assets/javascripts/admin/addon/components/simple-list.hbs b/app/assets/javascripts/admin/addon/components/simple-list.hbs
index 2e75aab1059..277d8b5e5b6 100644
--- a/app/assets/javascripts/admin/addon/components/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/simple-list.hbs
@@ -38,7 +38,7 @@
       <ComboBox
         @content={{this.validValues}}
         @value={{this.newValue}}
-        @onChange={{action this.addValue}}
+        @onChange={{this.addValue}}
         @valueProperty={{this.setting.computedValueProperty}}
         @nameProperty={{this.setting.computedNameProperty}}
         @options={{hash castInteger=true allowAny=false}}
diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.hbs b/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
index 0335ed7b643..606862e3e65 100644
--- a/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
@@ -3,7 +3,7 @@
   <WatchedWords
     @id="watched-words"
     @value={{this.words}}
-    @onChange={{action (mut this.words)}}
+    @onChange={{fn (mut this.words)}}
     @options={{hash
       filterPlaceholder=this.placeholderKey
       disabled=this.formSubmitted
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index 8c3e0634046..19f80d5018b 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -47,7 +47,7 @@
               <ComboBox
                 @value={{this.group}}
                 @content={{this.groupOptions}}
-                @onChange={{action this.groupChanged}}
+                @onChange={{this.groupChanged}}
                 @options={{hash none="directory.group.all"}}
                 class="directory-group-selector"
               />
diff --git a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js
index 4df9043f33b..f5a3d52022b 100644
--- a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js
+++ b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js
@@ -15,16 +15,16 @@ export default class AutomationNew extends Controller {
   }
 
   @action
-  saveAutomation(automation) {
+  saveAutomation() {
     this.set("error", null);
 
-    automation
+    this.model.automation
       .save(this.form.getProperties("name", "script"))
       .then(() => {
         this._resetForm();
         this.router.transitionTo(
           "adminPlugins.discourse-automation.edit",
-          automation.id
+          this.model.automation.id
         );
       })
       .catch((e) => {
diff --git a/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-new.hbs b/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-new.hbs
index 967cb76166b..6343f6e4fa7 100644
--- a/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-new.hbs
+++ b/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-new.hbs
@@ -27,7 +27,7 @@
         <DropdownSelectBox
           @value={{form.script}}
           @content={{model.scriptables.content}}
-          @onChange={{action (mut form.script)}}
+          @onChange={{fn (mut form.script)}}
           @options={{hash
             showCaret=true
             filterable=true
@@ -39,12 +39,11 @@
     </div>
 
     <div class="control-group">
-
       <div class="controls">
         <DButton
           @icon="plus"
           @label="discourse_automation.create"
-          @action={{action "saveAutomation" model.automation}}
+          @action={{this.saveAutomation}}
           class="btn-primary create-automation"
         />
       </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
index 39e2eaeb57b..08c722950ba 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
@@ -58,7 +58,7 @@
       </label>
       <CategoryChooser
         @value={{this.categoryId}}
-        @onChange={{action this.onCategoryChange}}
+        @onChange={{this.onCategoryChange}}
         @options={{hash
           formName="chatable_id"
           none="chat.create_channel.choose_category.none"
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
index baf472aa5bd..5f38f633ce1 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
@@ -74,8 +74,8 @@
             @minDate={{this.minDate}}
             @timeFormat={{this.timeFormat}}
             @dateFormat={{this.dateFormat}}
-            @onChangeDate={{action this.changeSelectedDate}}
-            @onChangeTime={{action this.changeSelectedTime}}
+            @onChangeDate={{this.changeSelectedDate}}
+            @onChangeTime={{this.changeSelectedTime}}
           />
         </div>
 
diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs
index 2d6f2255dbf..42effef7aef 100644
--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.hbs
@@ -59,7 +59,7 @@
           @content={{this.groupableUserFields}}
           @value={{this.groupedBy}}
           @nameProperty="label"
-          @onChange={{action this.setGrouping}}
+          @onChange={{this.setGrouping}}
           class="poll-breakdown-dropdown"
         />
       </div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.hbs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.hbs
index a422014b50a..deac3d3c715 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.hbs
@@ -7,8 +7,8 @@
       @minDate={{this.minDate}}
       @timeFormat={{this.timeFormat}}
       @dateFormat={{this.dateFormat}}
-      @onChangeDate={{action this.changeDate}}
-      @onChangeTime={{action this.changeTime}}
+      @onChangeDate={{this.changeDate}}
+      @onChangeTime={{this.changeTime}}
     />
   </Styleguide::Component>