diff --git a/app/components/public/add-to-calender.hbs b/app/components/public/add-to-calender.hbs
index 7ad8cacbe3f..7c771f09d6c 100644
--- a/app/components/public/add-to-calender.hbs
+++ b/app/components/public/add-to-calender.hbs
@@ -5,7 +5,7 @@
       {{#if this.isSingleDay}}
         {{general-date @event.startsAt "dddd, D MMMM, YYYY" tz=@event.timezone}}<br>{{general-date @event.startsAt "h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "h:mm A" tz=@event.timezone}} 
       {{else}}
-        {{general-date @event.startsAt "dddd, D MMMM, YYYY h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "dddd, D MMMM, YYYY h:mm A" tz=@event.timezone}} 
+        {{general-date @event.startsAt 'date-time-long' tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt 'date-time-long' tz=@event.timezone}} 
       {{/if}}
       ({{this.timezone}})
       <br>
diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs
index bd39feab0ef..0ee8749ddcd 100644
--- a/app/components/public/session-item.hbs
+++ b/app/components/public/session-item.hbs
@@ -49,7 +49,7 @@
         <div class="right floated four wide column">
           {{#if @session.startsAt}}
             <div class=""><i class="icon map marker alternate"></i>{{@session.microlocation.name}}</div>
-            <div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt 'D MMM, YYYY h:mm A (z)' tz=@timezone}}</div>
+            <div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt 'date-time-tz-short' tz=@timezone}}</div>
           {{/if}}
         </div>
       {{/if}}
diff --git a/app/controllers/admin/messages/list.js b/app/controllers/admin/messages/list.js
index bdb21cc9657..6051cb5b0d4 100644
--- a/app/controllers/admin/messages/list.js
+++ b/app/controllers/admin/messages/list.js
@@ -52,10 +52,7 @@ get columns() {
       valuePath       : 'sentAt',
       headerComponent : 'tables/headers/sort',
       isSortable      : true,
-      cellComponent   : 'ui-table/cell/cell-simple-date',
-      options         : {
-        dateFormat: 'D MMM, YYYY h:mm A'
-      }
+      cellComponent   : 'ui-table/cell/cell-simple-date'
     }
 
   ];
diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js
index 6801f9988fe..c90d40e754e 100644
--- a/app/controllers/admin/sessions/list.js
+++ b/app/controllers/admin/sessions/list.js
@@ -32,30 +32,21 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         valuePath       : 'submittedAt',
         cellComponent   : 'ui-table/cell/cell-simple-date',
         isSortable      : true,
-        headerComponent : 'tables/headers/sort',
-        options         : {
-          dateFormat: 'D MMM, YYYY h:mm A'
-        }
+        headerComponent : 'tables/headers/sort'
       },
       {
         name            : this.l10n.t('Starts At'),
         valuePath       : 'startsAt',
         cellComponent   : 'ui-table/cell/cell-simple-date',
         isSortable      : true,
-        headerComponent : 'tables/headers/sort',
-        options         : {
-          dateFormat: 'D MMM, YYYY h:mm A'
-        }
+        headerComponent : 'tables/headers/sort'
       },
       {
         name            : this.l10n.t('Ends At'),
         valuePath       : 'endsAt',
         cellComponent   : 'ui-table/cell/cell-simple-date',
         isSortable      : true,
-        headerComponent : 'tables/headers/sort',
-        options         : {
-          dateFormat: 'D MMM, YYYY h:mm A'
-        }
+        headerComponent : 'tables/headers/sort'
       },
       {
         name            : this.l10n.t('Actions'),
diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js
index 0ef4ed33563..a182d15b037 100644
--- a/app/controllers/admin/users/list.js
+++ b/app/controllers/admin/users/list.js
@@ -70,20 +70,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         valuePath       : 'createdAt',
         cellComponent   : 'ui-table/cell/cell-simple-date',
         isSortable      : true,
-        headerComponent : 'tables/headers/sort',
-        options         : {
-          dateFormat: 'D MMM, YYYY h:mm A'
-        }
+        headerComponent : 'tables/headers/sort'
       },
       {
         name            : this.l10n.t('Last Accessed'),
         valuePath       : 'lastAccessedAt',
         isSortable      : true,
         headerComponent : 'tables/headers/sort',
-        cellComponent   : 'ui-table/cell/cell-simple-date',
-        options         : {
-          dateFormat: 'D MMM, YYYY h:mm A'
-        }
+        cellComponent   : 'ui-table/cell/cell-simple-date'
       }
     ];
   }
diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js
index ac58f7695f6..b8153f862e0 100644
--- a/app/controllers/events/view/sessions/list.js
+++ b/app/controllers/events/view/sessions/list.js
@@ -94,19 +94,13 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         name          : this.l10n.t('Submission Date'),
         width         : 90,
         valuePath     : 'submittedAt',
-        cellComponent : 'ui-table/cell/cell-simple-date',
-        options       : {
-          dateFormat: 'D MMM, YYYY h:mm A (z)'
-        }
+        cellComponent : 'ui-table/cell/cell-simple-date'
       },
       {
         name          : this.l10n.t('Last Modified'),
         width         : 90,
         valuePath     : 'lastModifiedAt',
-        cellComponent : 'ui-table/cell/cell-simple-date',
-        options       : {
-          dateFormat: 'D MMM, YYYY h:mm A (z)'
-        }
+        cellComponent : 'ui-table/cell/cell-simple-date'
       },
       {
         name            : this.l10n.t('Notify'),
diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js
index 380fc2fc204..5f537ebd03f 100644
--- a/app/controllers/events/view/tickets/orders/list.js
+++ b/app/controllers/events/view/tickets/orders/list.js
@@ -35,7 +35,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         cellComponent   : 'ui-table/cell/events/view/tickets/orders/cell-date',
         headerComponent : 'tables/headers/sort',
         width           : 100,
-        dateFormat      : 'D MMM, YYYY h:mm A (z)',
         isSortable      : true
       },
       {
diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js
index 04637f6619d..95c48cb44f7 100644
--- a/app/helpers/general-date.js
+++ b/app/helpers/general-date.js
@@ -1,6 +1,15 @@
 import Helper from '@ember/component/helper';
 import moment from 'moment';
 
+const dateFormats = {
+  'date-time-long'     : 'dddd, D MMMM, YYYY h:mm A',
+  'date-time-tz-long'  : 'dddd, D MMMM, YYYY h:mm A (z)',
+  'date-time-short'    : 'D MMM, YYYY h:mm A',
+  'date-time-tz-short' : 'D MMM, YYYY h:mm A (z)',
+  'date-short'         : 'D MMM, YYYY',
+  'time-tz-short'      : 'h:mm A (z)'
+};
+
 const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']);
 
 export function generalDate(params, { tz }) {
@@ -8,10 +17,10 @@ export function generalDate(params, { tz }) {
 
   const local = moment(params[0]).tz(timezone).locale();
 
-  let format = params[1] || 'h:mm A, MMMM Do YYYY (z)';
+  let format = (dateFormats[params[1]] || params[1]) || 'h:mm A, MMMM Do YYYY (z)';
 
   if (!locales12Hours.has(local)) {
-    format = format.replaceAll('h', 'H');
+    format = format.replace(/h/g, 'H');
     format = format.replace(' A', '');
     format = format.replace(' a', '');
   }
diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs
index ccc5e391828..e622496a988 100644
--- a/app/templates/admin/sales/revenue.hbs
+++ b/app/templates/admin/sales/revenue.hbs
@@ -38,7 +38,7 @@
                 {{order.name}}
               </td>
               <td>
-                {{general-date order.eventDate 'D MMM, YYYY'}} 
+                {{general-date order.eventDate 'date-short'}} 
               </td>
               <td class="right aligned">
                 {{order.ticketCount}}
diff --git a/app/templates/components/event-invoice/event-info.hbs b/app/templates/components/event-invoice/event-info.hbs
index 1b1b0281404..8d6fd76e834 100644
--- a/app/templates/components/event-invoice/event-info.hbs
+++ b/app/templates/components/event-invoice/event-info.hbs
@@ -12,9 +12,9 @@
   <div class="ui padded segment">
     <strong>{{t 'At'}} {{this.event.locationName}}</strong>
     <br>
-    <strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt 'date-time-long'}}
     <br>
-    <strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt 'date-time-long'}}
     {{#if this.event.ownerName}}
       <br>
       <strong>{{t 'Organized By'}}:</strong> {{this.event.ownerName}}
diff --git a/app/templates/components/event-invoice/invoice-summary.hbs b/app/templates/components/event-invoice/invoice-summary.hbs
index 3e7c7cb7dcb..ba514ae0757 100644
--- a/app/templates/components/event-invoice/invoice-summary.hbs
+++ b/app/templates/components/event-invoice/invoice-summary.hbs
@@ -26,8 +26,8 @@
     <tbody>
       <tr>
         <td>{{this.event.name}}</td>
-        <td>{{general-date this.data.issuedAt 'D MMM, YYYY'}}</td>
-        <td>{{general-date this.data.completedAt 'D MMM, YYYY'}}</td>
+        <td>{{general-date this.data.issuedAt 'date-short'}}</td>
+        <td>{{general-date this.data.completedAt 'date-short'}}</td>
         <td>{{currency-symbol this.eventCurrency}} {{format-money this.data.amount}}</td>
       </tr>
     </tbody>
diff --git a/app/templates/components/order-card.hbs b/app/templates/components/order-card.hbs
index 6a8e3afa033..022712ce256 100644
--- a/app/templates/components/order-card.hbs
+++ b/app/templates/components/order-card.hbs
@@ -27,7 +27,7 @@
       </SmartOverflow>
       <div class="meta">
         <span class="date">
-          {{general-date this.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.order.event.timezone}}
+          {{general-date this.order.event.startsAt 'date-time-tz-long' tz=this.order.event.timezone}}
         </span>
       </div>
       <SmartOverflow @class="description">
@@ -46,7 +46,7 @@
         </span>
         <span>#{{this.order.identifier}}</span>
         {{#if this.order.completedAt}}
-          <span>{{t 'on'}} {{general-date this.order.completedAt 'D MMM, YYYY h:mm A'}}</span>
+          <span>{{t 'on'}} {{general-date this.order.completedAt 'date-time-short'}}</span>
         {{/if}}
       </span>
     </div>
diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs
index 51d99aa933f..48889c4ee87 100644
--- a/app/templates/components/orders/event-info.hbs
+++ b/app/templates/components/orders/event-info.hbs
@@ -24,9 +24,9 @@
       <strong>{{t 'Location or online event details to be announced'}}</strong>
     {{/if}}
     <br>
-    <strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt 'date-time-long'}}
     <br>
-    <strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'date-time-long'}}
     {{#if this.data.event.ownerName}}
       <br>
       <strong>{{t 'Organized By'}}:</strong> {{this.data.event.ownerName}}
diff --git a/app/templates/components/public/call-for-speakers.hbs b/app/templates/components/public/call-for-speakers.hbs
index 75e5c5d7d7c..f05ffa03d9f 100644
--- a/app/templates/components/public/call-for-speakers.hbs
+++ b/app/templates/components/public/call-for-speakers.hbs
@@ -4,15 +4,15 @@
   {{#if this.data.speakersCall.isOpen}}
     <a href="#" class="ui basic green label">{{t 'Open'}}</a>
     <div class="sub header">
-      {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}}
+      {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt 'date-time-tz-long' tz=this.data.speakersCall.event.timezone}}
     </div>
   {{else}}
     <a href="#" class="ui basic red label">{{t 'Closed'}}</a>
     <div class="sub header">
       {{#if this.data.speakersCall.isInFuture}}
-        {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}}
+        {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt 'date-time-tz-long' tz=this.data.speakersCall.event.timezone}}
       {{else}}
-        {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}}
+        {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt 'date-time-tz-long' tz=this.data.speakersCall.event.timezone}}
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs
index b982811057b..c6838301d64 100644
--- a/app/templates/components/public/ticket-list.hbs
+++ b/app/templates/components/public/ticket-list.hbs
@@ -28,7 +28,7 @@
                 <small class="ui gray-text tiny">{{ticket.description}}</small>
               {{/if}}
               <div>
-                <small class="ui gray-text small">Sale ends on {{general-date ticket.salesEndsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=@event.timezone}}</small>
+                <small class="ui gray-text small">Sale ends on {{general-date ticket.salesEndsAt 'date-time-tz-long' tz=@event.timezone}}</small>
               </div>
             </td>
             <td></td>
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs
index 8494bdae418..261bface4b9 100644
--- a/app/templates/components/session-card.hbs
+++ b/app/templates/components/session-card.hbs
@@ -20,7 +20,7 @@
       <div class="meta">
         <span class="time">
           {{#if this.session.startsAt}}
-            {{general-date this.session.startsAt 'D MMM, YYYY h:mm A'}}
+            {{general-date this.session.startsAt 'date-time-short'}}
           {{else}}
             {{t 'Session Not Yet Scheduled'}}
           {{/if}}
diff --git a/app/templates/components/ui-table/cell/cell-event-date.hbs b/app/templates/components/ui-table/cell/cell-event-date.hbs
index c61779a3115..1d9e2b82ad2 100644
--- a/app/templates/components/ui-table/cell/cell-event-date.hbs
+++ b/app/templates/components/ui-table/cell/cell-event-date.hbs
@@ -1,11 +1,11 @@
 {{#if this.record}}
   {{#if this.extraRecords.endsAt}}
     <div>
-      {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}}
+      {{general-date this.record 'date-time-tz-short' tz=this.extraRecords.timezone}}
     </div>
     (to)
     <div>
-      {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}}
+      {{general-date this.record 'date-time-tz-short' tz=this.extraRecords.timezone}}
     </div>
   {{else}}
     <span>
diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs
index e4a3e944ca4..3094bd9dce0 100644
--- a/app/templates/components/ui-table/cell/cell-simple-date.hbs
+++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs
@@ -1,9 +1,9 @@
 {{#if this.extraRecords.timezone}}
   <span>
-    {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}}
+    {{general-date this.record 'date-time-tz-short' tz=this.extraRecords.timezone}}
   </span>
 {{else if this.record}}
   <span>
-    {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat "D MMM, YYYY h:mm A")}}
+    {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat 'date-time-short')}}
   </span>
 {{/if}}
diff --git a/app/templates/components/ui-table/cell/cell-validity.hbs b/app/templates/components/ui-table/cell/cell-validity.hbs
index 3aeb33e79a3..430d43cb25c 100644
--- a/app/templates/components/ui-table/cell/cell-validity.hbs
+++ b/app/templates/components/ui-table/cell/cell-validity.hbs
@@ -1,5 +1,5 @@
 <span>
-  {{general-date this.record 'D MMM, YYYY h:mm A'}}
+  {{general-date this.record 'date-time-short'}}
   <br>To<br>
-  {{general-date this.extraRecords.validTill 'D MMM, YYYY h:mm A'}}
+  {{general-date this.extraRecords.validTill 'date-time-short'}}
 </span>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
index c68787e03ad..5a5772addeb 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
@@ -1,5 +1,5 @@
 {{#if (eq @record.status 'completed')}}
-  {{general-date @record.completedAt "D MMM, YYYY h:mm A"}}
+  {{general-date @record.completedAt 'date-time-short'}}
 {{else}}
-  {{general-date @record.createdAt "D MMM, YYYY h:mm A"}}
+  {{general-date @record.createdAt 'date-time-short'}}
 {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
index b972e59575a..a183b12089e 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
@@ -10,10 +10,10 @@
       </span>
     {{/if}}
     {{#if (eq this.record.status 'completed')}}
-      {{general-date this.record.completedAt 'D MMM, YYYY h:mm A'}}
+      {{general-date this.record.completedAt 'date-time-short'}}
       {{moment-from-now this.record.completedAt}}
     {{else}}
-      {{general-date this.record.createdAt 'D MMM, YYYY h:mm A'}}
+      {{general-date this.record.createdAt 'date-time-short'}}
       {{moment-from-now this.record.createdAt}}
     {{/if}}
   </div>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs
index 6fde70bd393..a10312890db 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs
@@ -1,3 +1,3 @@
 <span>
-	{{general-date this.record 'D MMM, YYYY h:mm A'}}
+	{{general-date this.record 'date-time-short'}}
 </span>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs
index e3b6b7bf56e..8e92e2dbe93 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs
@@ -1,9 +1,9 @@
 {{#if this.record}}
   <div>
-    {{general-date this.record 'D MMM, YYYY h:mm A'}}
+    {{general-date this.record 'date-time-short'}}
   </div>
 {{else}}
   <div>
-    {{general-date this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}}
+    {{general-date this.extraRecords.createdAt 'date-time-short'}}
   </div>
 {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
index 9a06c532675..c93e05fea22 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
@@ -13,9 +13,9 @@
     {{/if}}
     <span class="muted text">
       {{#if this.extraRecords.completedAt}}
-        {{general-date this.extraRecords.completedAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}}
+        {{general-date this.extraRecords.completedAt 'date-time-short'}} {{moment-from-now this.extraRecords.completedAt}}
       {{else}}
-        {{general-date this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}}
+        {{general-date this.extraRecords.createdAt 'date-time-short'}} {{moment-from-now this.extraRecords.createdAt}}
       {{/if}}
     </span>
   </div>
diff --git a/app/templates/event-invoice/review.hbs b/app/templates/event-invoice/review.hbs
index 6df92d364d2..36e0b172c8e 100644
--- a/app/templates/event-invoice/review.hbs
+++ b/app/templates/event-invoice/review.hbs
@@ -15,10 +15,10 @@
                 <strong>{{t 'Event Name'}}:</strong> {{this.model.event.name}}
               </div>
               <div class="item">
-                <strong>{{t 'Date Issued'}}:</strong> {{general-date this.model.issuedAt 'UTC' 'D MMM, YYYY'}} 
+                <strong>{{t 'Date Issued'}}:</strong> {{general-date this.model.issuedAt 'date-short' tz='UTC'}} 
               </div>
               <div class="item">
-                <strong>{{t 'Due Date'}}:</strong> {{general-date this.model.dueAt 'UTC' 'D MMM, YYYY'}} 
+                <strong>{{t 'Due Date'}}:</strong> {{general-date this.model.dueAt 'date-short' tz='UTC'}} 
               </div>
               <div class="item">
                 <strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol this.model.event.paymentCurrency}} {{format-money this.model.amount}}
diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs
index 881953be818..2cbfd82446f 100644
--- a/app/templates/explore.hbs
+++ b/app/templates/explore.hbs
@@ -25,13 +25,13 @@
       {{/if}}
       {{#if this.filters.start_date}}
         <div class="ui mini label">
-          {{general-date this.filters.start_date 'D MMM, YYYY'}}
+          {{general-date this.filters.start_date 'date-short'}}
           <a href="#" role="button" {{action 'clearFilter' 'start_date'}}><i class="icon close"></i></a>
         </div>
       {{/if}}
       {{#if this.filters.end_date}}
         <div class="ui mini label">
-          {{general-date this.filters.end_date 'D MMM, YYYY'}}
+          {{general-date this.filters.end_date 'date-short'}}
           <a href="#" role="button" {{action 'clearFilter' 'end_date'}}><i class="icon close"></i></a>
         </div>
       {{/if}}
diff --git a/app/templates/orders/expired.hbs b/app/templates/orders/expired.hbs
index 173f6864c89..127565cca2c 100644
--- a/app/templates/orders/expired.hbs
+++ b/app/templates/orders/expired.hbs
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="column">
       <div class="ui small gray-text">
-        {{general-date this.model.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
+        {{general-date this.model.event.startsAt 'date-time-long'}} - {{general-date this.model.event.endsAt 'date-time-long'}}
         <br>
         {{this.model.event.locationName}}
       </div>
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs
index 420cd9f21a8..5d8f1d530dd 100644
--- a/app/templates/orders/new.hbs
+++ b/app/templates/orders/new.hbs
@@ -8,7 +8,7 @@
     <div class="row">
       <div class="column">
         <div class="ui small gray-text">
-          {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
+          {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
           <br>
           {{this.model.order.event.locationName}}
         </div>
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs
index 25998f5cb7d..8077f289792 100644
--- a/app/templates/orders/pending.hbs
+++ b/app/templates/orders/pending.hbs
@@ -8,7 +8,7 @@
     <div class="row">
       <div class="column">
         <div class="ui small gray-text">
-          {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
+          {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
           <br>
           {{this.model.order.event.locationName}}
         </div>
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs
index 6507fb0e41e..cf1e520dc62 100644
--- a/app/templates/orders/view.hbs
+++ b/app/templates/orders/view.hbs
@@ -7,7 +7,7 @@
   <div class="row print">
     <div class="column">
       <div class="ui small gray-text">
-        {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
+        {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
         <br>
         {{this.model.order.event.locationName}}
       </div>
diff --git a/app/templates/public.hbs b/app/templates/public.hbs
index de27ac390af..4bf89d25733 100644
--- a/app/templates/public.hbs
+++ b/app/templates/public.hbs
@@ -9,9 +9,9 @@
             <img src="{{this.model.logoUrl}}" class="logo mr-8" />
           {{/if}}
           <div>
-            <h4 class="event time">{{general-date this.model.startsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.model.timezone}}</h4>
+            <h4 class="event time">{{general-date this.model.startsAt 'date-time-tz-long' tz=this.model.timezone}}</h4>
             {{#if this.displayEndDate}}
-              <h5 class="event time ends">{{t 'To'}} {{general-date this.model.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.model.timezone}}</h5>
+              <h5 class="event time ends">{{t 'To'}} {{general-date this.model.endsAt 'date-time-tz-long' tz=this.model.timezone}}</h5>
             {{/if}}
             <h1 class="event name">{{this.model.name}}</h1>
             <h4 class="event location"><i class="icon map marker alternate"></i>{{this.headerLocation}}</h4>
diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs
index a3f982a148c..81de1c16ba5 100644
--- a/app/templates/public/sessions.hbs
+++ b/app/templates/public/sessions.hbs
@@ -3,7 +3,7 @@
 <div class="d-flex wrap">
   <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=null}} class="ui button mb-2">{{t 'All'}}</LinkTo>
   {{#each this.allDates as |date|}}
-    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{general-date date 'D MMM, YYYY'}}</LinkTo>
+    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{general-date date 'date-short'}}</LinkTo>
   {{/each}}
 
   <Widgets::TimeZonePicker
@@ -59,7 +59,7 @@
           <tr>
             <td class="top aligned {{unless this.device.isMobile 'centered text'}}" style="border-top: none;">
               <h4 class="ui header {{unless this.device.isMobile 'pt-4'}}" style="color: rgba(0, 0, 0, 0.7);">
-                {{general-date session.startsAt 'h:mm A (z)' tz=this.timezone}}
+                {{general-date session.startsAt 'time-tz-short' tz=this.timezone}}
               </h4>
             </td>
             <td style="border-top: none; border-left: 1px solid lightgrey">