diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb
index 19ab4a50959..3a9d1da3c47 100644
--- a/app/controllers/groups/runners_controller.rb
+++ b/app/controllers/groups/runners_controller.rb
@@ -3,6 +3,7 @@ class Groups::RunnersController < Groups::ApplicationController
   before_action :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
 
   def show
+    render 'shared/runners/show'
   end
 
   def edit
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index c2fa6b66b17..656b014aa8a 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -44,6 +44,7 @@ class Projects::RunnersController < Projects::ApplicationController
   end
 
   def show
+    render 'shared/runners/show'
   end
 
   def toggle_shared_runners
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index d022016f70d..73fadc042b1 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -29,7 +29,7 @@
 %hr
 
 .append-bottom-20
-  = render '/projects/runners/form', runner: @runner, runner_form_url: admin_runner_path(@runner)
+  = render 'shared/runners/form', runner: @runner, runner_form_url: admin_runner_path(@runner)
 
 .row
   .col-md-6
diff --git a/app/views/groups/runners/edit.html.haml b/app/views/groups/runners/edit.html.haml
index 89e64059610..d4993d9c235 100644
--- a/app/views/groups/runners/edit.html.haml
+++ b/app/views/groups/runners/edit.html.haml
@@ -3,4 +3,4 @@
 %h4 Runner ##{@runner.id}
 
 %hr
-  = render 'form', runner: @runner, runner_form_url: group_runner_path(@group, @runner)
+  = render 'shared/runners/form', runner: @runner, runner_form_url: group_runner_path(@group, @runner)
diff --git a/app/views/groups/runners/show.html.haml b/app/views/groups/runners/show.html.haml
deleted file mode 100644
index 0390607543d..00000000000
--- a/app/views/groups/runners/show.html.haml
+++ /dev/null
@@ -1,57 +0,0 @@
-- page_title "#{@runner.description} ##{@runner.id}", "Runners"
-
-%h3.page-title
-  Runner ##{@runner.id}
-
-.table-holder
-  %table.table
-    %thead
-      %tr
-        %th Property Name
-        %th Value
-    %tr
-      %td Active
-      %td= @runner.active? ? 'Yes' : 'No'
-    %tr
-      %td Protected
-      %td= @runner.ref_protected? ? 'Yes' : 'No'
-    %tr
-      %td Can run untagged jobs
-      %td= @runner.run_untagged? ? 'Yes' : 'No'
-    %tr
-      %td Tags
-      %td
-        - @runner.tag_list.sort.each do |tag|
-          %span.label.label-primary
-            = tag
-    %tr
-      %td Name
-      %td= @runner.name
-    %tr
-      %td Version
-      %td= @runner.version
-    %tr
-      %td IP Address
-      %td= @runner.ip_address
-    %tr
-      %td Revision
-      %td= @runner.revision
-    %tr
-      %td Platform
-      %td= @runner.platform
-    %tr
-      %td Architecture
-      %td= @runner.architecture
-    %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_with_tooltip @runner.contacted_at
-        - else
-          Never
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
deleted file mode 100644
index 6a681736b6f..00000000000
--- a/app/views/projects/runners/_form.html.haml
+++ /dev/null
@@ -1,55 +0,0 @@
-= form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
-  = form_errors(runner)
-  .form-group
-    = label :active, "Active", class: 'control-label'
-    .col-sm-10
-      .checkbox
-        = f.check_box :active
-        %span.light Paused Runners don't accept new jobs
-  .form-group
-    = label :protected, "Protected", class: 'control-label'
-    .col-sm-10
-      .checkbox
-        = f.check_box :access_level, {}, 'ref_protected', 'not_protected'
-        %span.light This runner will only run on pipelines triggered on protected branches
-  .form-group
-    = label :run_untagged, 'Run untagged jobs', class: 'control-label'
-    .col-sm-10
-      .checkbox
-        = f.check_box :run_untagged
-        %span.light Indicates whether this runner can pick jobs without tags
-  .form-group
-    = label :locked, 'Lock to current projects', class: 'control-label'
-    .col-sm-10
-      .checkbox
-        = f.check_box :locked
-        %span.light When a runner is locked, it cannot be assigned to other projects
-  .form-group
-    = label_tag :token, class: 'control-label' do
-      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
-    .col-sm-10
-      = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
-      .help-block You can setup jobs to only use Runners with specific tags. Separate tags with commas.
-  .form-actions
-    = f.submit 'Save changes', class: 'btn btn-save'
diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml
index fc5205ecf5e..56eb526bfd5 100644
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
@@ -3,4 +3,4 @@
 %h4 Runner ##{@runner.id}
 
 %hr
-  = render 'form', runner: @runner, runner_form_url: project_runner_path(@project, @runner)
+  = render 'shared/runners/form', runner: @runner, runner_form_url: project_runner_path(@project, @runner)
diff --git a/app/views/groups/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml
similarity index 87%
rename from app/views/groups/runners/_form.html.haml
rename to app/views/shared/runners/_form.html.haml
index 3efa145f86a..a995c355bd8 100644
--- a/app/views/groups/runners/_form.html.haml
+++ b/app/views/shared/runners/_form.html.haml
@@ -18,6 +18,13 @@
       .checkbox
         = f.check_box :run_untagged
         %span.light Indicates whether this runner can pick jobs without tags
+  - unless runner.group_type?
+    .form-group
+      = label :locked, 'Lock to current projects', class: 'control-label'
+      .col-sm-10
+        .checkbox
+          = f.check_box :locked
+          %span.light When a runner is locked, it cannot be assigned to other projects
   .form-group
     = label_tag :token, class: 'control-label' do
       Token
diff --git a/app/views/projects/runners/show.html.haml b/app/views/shared/runners/show.html.haml
similarity index 86%
rename from app/views/projects/runners/show.html.haml
rename to app/views/shared/runners/show.html.haml
index f33e7e25b68..1265305608c 100644
--- a/app/views/projects/runners/show.html.haml
+++ b/app/views/shared/runners/show.html.haml
@@ -6,6 +6,9 @@
     - if @runner.shared?
       %span.runner-state.runner-state-shared
         Shared
+    - elsif @runner.group_type?
+      %span.runner-state.runner-state-shared
+        Group
     - else
       %span.runner-state.runner-state-specific
         Specific
@@ -25,9 +28,10 @@
     %tr
       %td Can run untagged jobs
       %td= @runner.run_untagged? ? 'Yes' : 'No'
-    %tr
-      %td Locked to this project
-      %td= @runner.locked? ? 'Yes' : 'No'
+    - unless @runner.group_type?
+      %tr
+        %td Locked to this project
+        %td= @runner.locked? ? 'Yes' : 'No'
     %tr
       %td Tags
       %td