diff --git a/app/components/create-session-message.js b/app/components/create-session-message.js
index fa7bf757518..c7a3edb708d 100644
--- a/app/components/create-session-message.js
+++ b/app/components/create-session-message.js
@@ -1,10 +1,11 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { computed } from '@ember/object';
 import Component from '@ember/component';
 
 @classic
 export default class CreateSessionMessage extends Component {
-  isMessageVisible = true;
+  @tracked isMessageVisible = true;
 
   @computed(
     'session.isAuthenticated',
diff --git a/app/components/events/view/overview/manage-roles.js b/app/components/events/view/overview/manage-roles.js
index 0504611b0f5..e0eda2e9fd5 100644
--- a/app/components/events/view/overview/manage-roles.js
+++ b/app/components/events/view/overview/manage-roles.js
@@ -1,3 +1,4 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { classNames } from '@ember-decorators/component';
 import { action, computed } from '@ember/object';
@@ -6,7 +7,7 @@ import Component from '@ember/component';
 @classic
 @classNames('ui', 'fluid', 'card')
 export default class ManageRoles extends Component {
-  roleType = 'accepted';
+  @tracked roleType = 'accepted';
 
   @computed('data.roleInvites.@each', 'roleType')
   get roleInvites() {
diff --git a/app/components/explore/side-bar.js b/app/components/explore/side-bar.js
index a711058b969..0d130232c14 100644
--- a/app/components/explore/side-bar.js
+++ b/app/components/explore/side-bar.js
@@ -1,3 +1,4 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import Component from '@ember/component';
 import moment from 'moment';
@@ -13,7 +14,7 @@ export default class SideBar extends Component {
   customStartDate = moment().toISOString();
 
   customEndDate = null;
-  showFilters = false;
+  @tracked showFilters = false;
   isMapVisible = true;
 
   @computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', 'cfs')
@@ -28,7 +29,6 @@ export default class SideBar extends Component {
 
   showAllTypes = not('event_type');
 
-  @computed()
   get dateRanges() {
     return getDateRanges.bind(this)();
   }
diff --git a/app/components/forms/user-payment-info-form.js b/app/components/forms/user-payment-info-form.js
index 58fcfd31f1f..28a375ea2cb 100644
--- a/app/components/forms/user-payment-info-form.js
+++ b/app/components/forms/user-payment-info-form.js
@@ -3,7 +3,7 @@ import Component from '@ember/component';
 import FormMixin from 'open-event-frontend/mixins/form';
 import { validPhoneNumber } from 'open-event-frontend/utils/validators';
 import { pick, orderBy } from 'lodash-es';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { countries } from 'open-event-frontend/utils/dictionary/demography';
 
 @classic
@@ -92,7 +92,6 @@ export default class UserPaymentInfoForm extends Component.extend(FormMixin) {
     };
   }
 
-  @computed()
   get countries() {
     return orderBy(countries, 'name');
   }
diff --git a/app/components/modals/event-delete-modal.js b/app/components/modals/event-delete-modal.js
index 040f033cef4..e54f1946ab4 100644
--- a/app/components/modals/event-delete-modal.js
+++ b/app/components/modals/event-delete-modal.js
@@ -1,13 +1,12 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
-import { computed } from '@ember/object';
 import ModalBase from 'open-event-frontend/components/modals/modal-base';
 
 @classic
 export default class EventDeleteModal extends ModalBase {
   isSmall = true;
-  confirmName = '';
+  @tracked confirmName = '';
 
-  @computed('confirmName')
   get isNameDifferent() {
     return this.eventName ? this.confirmName !== this.eventName : true;
   }
diff --git a/app/components/modals/event-transfer-modal.js b/app/components/modals/event-transfer-modal.js
index 9392ae83447..fa7f0268415 100644
--- a/app/components/modals/event-transfer-modal.js
+++ b/app/components/modals/event-transfer-modal.js
@@ -1,3 +1,4 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { computed } from '@ember/object';
 import ModalBase from 'open-event-frontend/components/modals/modal-base';
@@ -5,7 +6,7 @@ import ModalBase from 'open-event-frontend/components/modals/modal-base';
 @classic
 export default class EventTransferModal extends ModalBase {
   isSmall = true;
-  confirmEventName = '';
+  @tracked confirmEventName = '';
 
   @computed('confirmEventName', 'eventName')
   get isNameDifferent() {
diff --git a/app/components/modals/user-delete-modal.js b/app/components/modals/user-delete-modal.js
index 28a0470d5ed..39ed5099398 100644
--- a/app/components/modals/user-delete-modal.js
+++ b/app/components/modals/user-delete-modal.js
@@ -1,13 +1,12 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
-import { computed } from '@ember/object';
 import ModalBase from 'open-event-frontend/components/modals/modal-base';
 
 @classic
 export default class UserDeleteModal extends ModalBase {
   isSmall = true;
-  confirmEmail = '';
+  @tracked confirmEmail = '';
 
-  @computed('confirmEmail')
   get isEmailDifferent() {
     return this.userEmail ? this.confirmEmail !== this.userEmail : true;
   }
diff --git a/app/components/tabbed-navigation.js b/app/components/tabbed-navigation.js
index 36d64c7952d..dd4620aa426 100644
--- a/app/components/tabbed-navigation.js
+++ b/app/components/tabbed-navigation.js
@@ -1,3 +1,4 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { classNames } from '@ember-decorators/component';
 import { action, computed } from '@ember/object';
@@ -7,14 +8,11 @@ import Component from '@ember/component';
 @classic
 @classNames('tabbed-navigation')
 export default class TabbedNavigation extends Component {
-  item = null;
+  @tracked item = null;
 
   @computed('session.currentRouteName', 'item')
   get currentRoute() {
-    const path = this.session.currentRouteName;
-    if (path) {
-      return this.item;
-    }
+    return this.session.currentRouteName && this.item;
   }
 
   didInsertElement() {
diff --git a/app/components/unverified-user-message.js b/app/components/unverified-user-message.js
index 30d4b7822ee..46a08440cf3 100644
--- a/app/components/unverified-user-message.js
+++ b/app/components/unverified-user-message.js
@@ -1,10 +1,11 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { action, computed } from '@ember/object';
 import Component from '@ember/component';
 
 @classic
 export default class UnverifiedUserMessage extends Component {
-  isMessageVisible = true;
+  @tracked isMessageVisible = true;
   isMailSent = false;
 
   @computed(
diff --git a/app/components/widgets/forms/image-upload.js b/app/components/widgets/forms/image-upload.js
index b77f322a730..f756d483e6f 100644
--- a/app/components/widgets/forms/image-upload.js
+++ b/app/components/widgets/forms/image-upload.js
@@ -1,3 +1,4 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { action, computed } from '@ember/object';
 import $ from 'jquery';
@@ -7,7 +8,7 @@ import { v4 } from 'ember-uuid';
 
 @classic
 export default class ImageUpload extends Component {
-  selectedImage = null;
+  @tracked selectedImage = null;
   allowDragDrop = true;
   requiresDivider = false;
 
diff --git a/app/components/widgets/forms/radio-button.js b/app/components/widgets/forms/radio-button.js
index 876c265b318..6b0557249fa 100644
--- a/app/components/widgets/forms/radio-button.js
+++ b/app/components/widgets/forms/radio-button.js
@@ -1,7 +1,7 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { attributeBindings, tagName } from '@ember-decorators/component';
 import { observes } from '@ember-decorators/object';
-import { computed } from '@ember/object';
 import $ from 'jquery';
 import Component from '@ember/component';
 import { once } from '@ember/runloop';
@@ -11,10 +11,9 @@ import { once } from '@ember/runloop';
 @attributeBindings('type', 'htmlChecked:checked', 'value', 'name', 'disabled')
 export default class RadioButton extends Component {
   type = 'radio';
-  value = null;
-  checked = null;
+  @tracked value = null;
+  @tracked checked = null;
 
-  @computed('value', 'checked')
   get htmlChecked() {
     return this.value === this.checked;
   }
diff --git a/app/components/widgets/steps-indicator.js b/app/components/widgets/steps-indicator.js
index 7601feb327e..ddabd12458b 100644
--- a/app/components/widgets/steps-indicator.js
+++ b/app/components/widgets/steps-indicator.js
@@ -1,3 +1,4 @@
+import { tracked } from '@glimmer/tracking';
 import classic from 'ember-classic-decorator';
 import { observes } from '@ember-decorators/object';
 import Component from '@ember/component';
@@ -6,9 +7,9 @@ import { map, findIndex } from 'lodash-es';
 
 @classic
 export default class StepsIndicator extends Component {
-  enableAll = true;
+  @tracked enableAll = true;
   autoSteps = false;
-  currentStep = 1;
+  @tracked currentStep = 1;
 
   @computed('currentStep')
   get currentIndex() {
diff --git a/app/controllers/account/billing/invoices/list.js b/app/controllers/account/billing/invoices/list.js
index 1de3d50cd3d..06dc46efc79 100644
--- a/app/controllers/account/billing/invoices/list.js
+++ b/app/controllers/account/billing/invoices/list.js
@@ -1,9 +1,7 @@
 import Controller from '@ember/controller';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
-import { computed } from '@ember/object';
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     let columns = [];
     if (this.model.params.invoice_status === 'upcoming') {
diff --git a/app/controllers/admin/events/list.js b/app/controllers/admin/events/list.js
index cd848f95665..af4ce010f3c 100644
--- a/app/controllers/admin/events/list.js
+++ b/app/controllers/admin/events/list.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import { or } from '@ember/object/computed';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
@@ -8,7 +8,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
 
    @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;
 
-   @computed()
    get columns() {
      return [
        {
diff --git a/app/controllers/admin/messages/list.js b/app/controllers/admin/messages/list.js
index 5a0261b3b2e..38e28aafbf5 100644
--- a/app/controllers/admin/messages/list.js
+++ b/app/controllers/admin/messages/list.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
@@ -9,7 +8,6 @@ sort_by = 'time';
 
 sort_dir = 'ASC';
 
-@computed()
 get columns() {
   return [
     {
diff --git a/app/controllers/admin/reports/system-logs/activity-logs.js b/app/controllers/admin/reports/system-logs/activity-logs.js
index f6a35a08995..50a18daca6c 100644
--- a/app/controllers/admin/reports/system-logs/activity-logs.js
+++ b/app/controllers/admin/reports/system-logs/activity-logs.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
@@ -8,7 +7,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
   sort_by = 'time';
   sort_dir = 'ASC';
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/admin/reports/system-logs/mail-logs.js b/app/controllers/admin/reports/system-logs/mail-logs.js
index 6586d4cd843..246a6a191a3 100644
--- a/app/controllers/admin/reports/system-logs/mail-logs.js
+++ b/app/controllers/admin/reports/system-logs/mail-logs.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
@@ -8,7 +7,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
   sort_by = 'time';
   sort_dir = 'ASC';
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/admin/reports/system-logs/notification-logs.js b/app/controllers/admin/reports/system-logs/notification-logs.js
index a867fe80a49..f0daf6b429f 100644
--- a/app/controllers/admin/reports/system-logs/notification-logs.js
+++ b/app/controllers/admin/reports/system-logs/notification-logs.js
@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
@@ -7,7 +6,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
   per_page = 100;
   sort_by = 'received-at';
   sort_dir = 'ASC';
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/admin/sales/invoices.js b/app/controllers/admin/sales/invoices.js
index 38e0d8f3b9c..6b11e3bbce9 100644
--- a/app/controllers/admin/sales/invoices.js
+++ b/app/controllers/admin/sales/invoices.js
@@ -1,11 +1,9 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js
index e5233ed4308..91c8a7593f0 100644
--- a/app/controllers/admin/sessions/list.js
+++ b/app/controllers/admin/sessions/list.js
@@ -1,9 +1,8 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/admin/settings/billing.js b/app/controllers/admin/settings/billing.js
index 411684bfde1..724bebe4a24 100644
--- a/app/controllers/admin/settings/billing.js
+++ b/app/controllers/admin/settings/billing.js
@@ -1,14 +1,13 @@
 import Controller from '@ember/controller';
 import { timezones } from 'open-event-frontend/utils/dictionary/date-time';
 import { countries } from 'open-event-frontend/utils/dictionary/demography';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { paymentCountries } from 'open-event-frontend/utils/dictionary/payment';
 import { orderBy, filter } from 'lodash-es';
 
 
 export default class extends Controller {
   timezones = timezones;
-  @computed()
   get countries() {
     return orderBy(filter(countries, country => paymentCountries.includes(country.code)), 'name');
   }
diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js
index beb37470056..56753a3a0f0 100644
--- a/app/controllers/admin/users/list.js
+++ b/app/controllers/admin/users/list.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import { or } from '@ember/object/computed';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
@@ -7,7 +7,6 @@ import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-co
 export default class extends Controller.extend(EmberTableControllerMixin) {
   @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/admin/users/view/events/list.js b/app/controllers/admin/users/view/events/list.js
index 6f40a709bf0..86628fd12b3 100644
--- a/app/controllers/admin/users/view/events/list.js
+++ b/app/controllers/admin/users/view/events/list.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 import { or } from '@ember/object/computed';
 
@@ -7,7 +7,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
 
   @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges;
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/import.js b/app/controllers/events/import.js
index 796c1c2ebd5..e4cc8c15fb9 100644
--- a/app/controllers/events/import.js
+++ b/app/controllers/events/import.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { run } from '@ember/runloop';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 
 export default class extends Controller {
   importStatus = '';
@@ -9,7 +9,6 @@ export default class extends Controller {
   file         = false;
   fileName     = '';
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js
index 9177b6f70c8..3ad2c2e05f9 100644
--- a/app/controllers/events/list.js
+++ b/app/controllers/events/list.js
@@ -1,10 +1,9 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/index.js b/app/controllers/events/view/index.js
index 74061185446..a2c6af8e3fb 100644
--- a/app/controllers/events/view/index.js
+++ b/app/controllers/events/view/index.js
@@ -1,10 +1,9 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js
index 03cadbbebcc..fbd6d67b5b9 100644
--- a/app/controllers/events/view/sessions/list.js
+++ b/app/controllers/events/view/sessions/list.js
@@ -1,12 +1,11 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import { mapBy } from '@ember/object/computed';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
   @mapBy('model.feedbacks', 'session.id') ratedSessions;
 
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/speakers/list.js b/app/controllers/events/view/speakers/list.js
index 815d25c9d08..f5444709ee9 100644
--- a/app/controllers/events/view/speakers/list.js
+++ b/app/controllers/events/view/speakers/list.js
@@ -1,10 +1,9 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/tickets/access-codes/list.js b/app/controllers/events/view/tickets/access-codes/list.js
index a0fdc1f6a7d..b170745b120 100644
--- a/app/controllers/events/view/tickets/access-codes/list.js
+++ b/app/controllers/events/view/tickets/access-codes/list.js
@@ -1,10 +1,9 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js
index ceb828d5c53..b7056e68f68 100644
--- a/app/controllers/events/view/tickets/attendees/list.js
+++ b/app/controllers/events/view/tickets/attendees/list.js
@@ -1,11 +1,10 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 import moment from 'moment';
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/tickets/discount-codes/list.js b/app/controllers/events/view/tickets/discount-codes/list.js
index beb81222f00..a07c985c71f 100644
--- a/app/controllers/events/view/tickets/discount-codes/list.js
+++ b/app/controllers/events/view/tickets/discount-codes/list.js
@@ -1,10 +1,9 @@
 import Controller from '@ember/controller';
-import { computed, action } from '@ember/object';
+import { action } from '@ember/object';
 import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     return [
       {
diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js
index f38d0aaaa16..b814deb42a5 100644
--- a/app/controllers/events/view/tickets/orders/list.js
+++ b/app/controllers/events/view/tickets/orders/list.js
@@ -4,7 +4,6 @@ import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-co
 
 
 export default class extends Controller.extend(EmberTableControllerMixin) {
-  @computed()
   get columns() {
     return [
       {