diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 7a34972dfbf65052b2b4c5b99a4f2706ad843521..049f3d612941e1f48ca6753d214422acbad6ec02 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -29,9 +29,9 @@
       %h4.page-title.d-flex
         .gl-display-flex.gl-align-items-center.gl-justify-content-center
           = sprite_icon('clock', size: 18, css_class: 'pod-icon gl-mr-3')
-        = _('Uptime')
+        = _('System started')
       .data
-        %h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at)
+        %h2= time_ago_with_tooltip(Rails.application.config.booted_at)
   .col-sm
     .bg-light.info-well.p-3
       %h4.page-title.d-flex
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 462fb2a420f8f05381326e4ff5b784bc44af6171..5031f9f2e25547477bb9330dd274c6d6867afdb4 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -37922,6 +37922,9 @@ msgstr ""
 msgid "System output"
 msgstr ""
 
+msgid "System started"
+msgstr ""
+
 msgid "Table of Contents"
 msgstr ""
 
@@ -41511,9 +41514,6 @@ msgstr ""
 msgid "Upstream"
 msgstr ""
 
-msgid "Uptime"
-msgstr ""
-
 msgid "Upvotes"
 msgstr ""
 
diff --git a/spec/features/admin/admin_system_info_spec.rb b/spec/features/admin/admin_system_info_spec.rb
index 2225f25aa1e1a10d680308db79bf24124d1e5d90..8ff31dfded7749c203415f5f9436f83da44fa689 100644
--- a/spec/features/admin/admin_system_info_spec.rb
+++ b/spec/features/admin/admin_system_info_spec.rb
@@ -24,7 +24,7 @@
         expect(page).to have_content 'CPU 2 cores'
         expect(page).to have_content 'Memory Usage 4 GB / 16 GB'
         expect(page).to have_content 'Disk Usage'
-        expect(page).to have_content 'Uptime'
+        expect(page).to have_content 'System started'
       end
     end
 
@@ -39,7 +39,7 @@
         expect(page).to have_content 'CPU Unable to collect CPU info'
         expect(page).to have_content 'Memory Usage 4 GB / 16 GB'
         expect(page).to have_content 'Disk Usage'
-        expect(page).to have_content 'Uptime'
+        expect(page).to have_content 'System started'
       end
     end
 
@@ -54,7 +54,7 @@
         expect(page).to have_content 'CPU 2 cores'
         expect(page).to have_content 'Memory Usage Unable to collect memory info'
         expect(page).to have_content 'Disk Usage'
-        expect(page).to have_content 'Uptime'
+        expect(page).to have_content 'System started'
       end
     end
   end