diff --git a/app/views/groups/runners/_form.html.haml b/app/views/groups/runners/_form.html.haml
index 18bcc56688f37ae2f0df544087a0aeb26e595b76..3efa145f86a578fddc5b44bae416ca76691b2e36 100644
--- a/app/views/groups/runners/_form.html.haml
+++ b/app/views/groups/runners/_form.html.haml
@@ -23,11 +23,22 @@
       Token
     .col-sm-10
       = f.text_field :token, class: 'form-control', readonly: true
+  .form-group
+    = label_tag :ip_address, class: 'control-label' do
+      IP Address
+    .col-sm-10
+      = f.text_field :ip_address, class: 'form-control', readonly: true
   .form-group
     = label_tag :description, class: 'control-label' do
       Description
     .col-sm-10
       = f.text_field :description, class: 'form-control'
+  .form-group
+    = label_tag :maximum_timeout_human_readable, class: 'control-label' do
+      Maximum job timeout
+    .col-sm-10
+      = f.text_field :maximum_timeout_human_readable, class: 'form-control'
+      .help-block This timeout will take precedence when lower than Project-defined timeout
   .form-group
     = label_tag :tag_list, class: 'control-label' do
       Tags
diff --git a/app/views/groups/runners/show.html.haml b/app/views/groups/runners/show.html.haml
index 7836b02248e943f845ed603e6e877e5fb17057ce..0390607543d85e5b5b2a0210dd823fb1e9563ff7 100644
--- a/app/views/groups/runners/show.html.haml
+++ b/app/views/groups/runners/show.html.haml
@@ -30,6 +30,9 @@
     %tr
       %td Version
       %td= @runner.version
+    %tr
+      %td IP Address
+      %td= @runner.ip_address
     %tr
       %td Revision
       %td= @runner.revision
@@ -42,10 +45,13 @@
     %tr
       %td Description
       %td= @runner.description
+    %tr
+      %td Maximum job timeout
+      %td= @runner.maximum_timeout_human_readable
     %tr
       %td Last contact
       %td
         - if @runner.contacted_at
-          #{time_ago_in_words(@runner.contacted_at)} ago
+          = time_ago_with_tooltip @runner.contacted_at
         - else
           Never