diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl
index dbf8c860701..a00a4dbc261 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/runners/base.tmpl
@@ -2,7 +2,7 @@
 <div class="page-content admin runners">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "runners/list" .}}
+		{{template "shared/actions/runner_list" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl
index 0b98ef883ea..0963e97a5b6 100644
--- a/templates/admin/runners/edit.tmpl
+++ b/templates/admin/runners/edit.tmpl
@@ -2,7 +2,7 @@
 <div class="page-content admin runners">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "runners/edit" .}}
+		{{template "shared/actions/runner_edit" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/runners.tmpl
index e9c40ca0720..7c70f6d956b 100644
--- a/templates/org/settings/runners.tmpl
+++ b/templates/org/settings/runners.tmpl
@@ -5,7 +5,7 @@
 		<div class="ui grid">
 			{{template "org/settings/navbar" .}}
 			<div class="twelve wide column content">
-				{{template "runners/list" .}}
+				{{template "shared/actions/runner_list" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/org/settings/runners_edit.tmpl b/templates/org/settings/runners_edit.tmpl
index 2b6c2e288a1..931ca3701ab 100644
--- a/templates/org/settings/runners_edit.tmpl
+++ b/templates/org/settings/runners_edit.tmpl
@@ -5,7 +5,7 @@
 		<div class="ui grid">
 			{{template "org/settings/navbar" .}}
 			<div class="twelve wide column content">
-				{{template "runners/edit" .}}
+				{{template "shared/actions/runner_edit" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index f23573b8bed..10d410f096f 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -3,7 +3,7 @@
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "runners/edit" .}}
+		{{template "shared/actions/runner_edit" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index 345b934b02c..d3a0b64fc5e 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -3,7 +3,7 @@
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "runners/list" .}}
+		{{template "shared/actions/runner_list" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/runners/edit.tmpl b/templates/shared/actions/runner_edit.tmpl
similarity index 100%
rename from templates/runners/edit.tmpl
rename to templates/shared/actions/runner_edit.tmpl
diff --git a/templates/runners/list.tmpl b/templates/shared/actions/runner_list.tmpl
similarity index 100%
rename from templates/runners/list.tmpl
rename to templates/shared/actions/runner_list.tmpl