diff --git a/static/directives/quay-service-status-bar.html b/static/directives/quay-service-status-bar.html
index 84c3e0671..25cfdce50 100644
--- a/static/directives/quay-service-status-bar.html
+++ b/static/directives/quay-service-status-bar.html
@@ -10,7 +10,7 @@
      <i class="fa fa-calendar" style="margin-right: 6px;"></i>
      <span ng-switch on="scheduled.status" style="vertical-align: middle">
        <span ng-switch-when="scheduled">
-         Scheduled for {{ scheduled.scheduled_for | amDateFormat:'dddd, MMMM Do YYYY, h:mm A' }}:
+         Scheduled for <time-display datetime="scheduled.scheduled_for"></time-display>:
        </span>
        <b ng-switch-when="in_progress" style="color: #FDFFB9;">
          In progress:
diff --git a/static/directives/repo-tag-history.html b/static/directives/repo-tag-history.html
index ba756f26a..5c9a46da2 100644
--- a/static/directives/repo-tag-history.html
+++ b/static/directives/repo-tag-history.html
@@ -73,10 +73,14 @@
                   </span>
                 </span>
               </div>
-              <div class="history-datetime-small">{{ entry.time | amDateFormat:'dddd, MMMM Do YYYY, h:mm:ss a' }}</div>
+              <div class="history-datetime-small">
+                <time-display datetime="entry.time"></time-display>
+              </div>
             </td>
             <td ng-if="!entry.date_break" class="datetime-col hidden-sm hidden-xs">
-              <div class="history-datetime">{{ entry.time | amDateFormat:'MMM Do YYYY, h:mm:ss a' }}</div>
+              <div class="history-datetime">
+                <time-display datetime="entry.time"></time-display>
+              </div>
             </td>
             <td class="revert-col hidden-xs hidden-sm">
               <div ng-if="!entry.date_break && repository.can_write" class="history-revert">