diff --git a/server/template/html/repo_branch.html b/server/template/html/repo_branch.html
index 401ac008f..b8bd35f68 100644
--- a/server/template/html/repo_branch.html
+++ b/server/template/html/repo_branch.html
@@ -27,17 +27,17 @@
 				<header class="{{"pure-u-1"}}">
 					<h1>
 						<span>{{$__amber_6 := .Repo.Owner}}{{$__amber_6}}</span>
-						<span>/</span>{{$__amber_7 := .Repo.Name}}{{$__amber_8 := .Repo.Owner}}{{$__amber_9 := .Repo.Remote}}{{$__amber_10 := __amber_add "/" $__amber_9}}{{$__amber_11 := __amber_add $__amber_10 "/"}}{{$__amber_12 := __amber_add $__amber_11 $__amber_8}}{{$__amber_13 := __amber_add $__amber_12 "/"}}{{$__amber_14 := __amber_add $__amber_13 $__amber_7}}
+						<span>/</span>{{$__amber_7 := .Repo.Name}}{{$__amber_8 := .Repo.Owner}}{{$__amber_9 := .Repo.Host}}{{$__amber_10 := __amber_add "/" $__amber_9}}{{$__amber_11 := __amber_add $__amber_10 "/"}}{{$__amber_12 := __amber_add $__amber_11 $__amber_8}}{{$__amber_13 := __amber_add $__amber_12 "/"}}{{$__amber_14 := __amber_add $__amber_13 $__amber_7}}
 						<a href="{{$__amber_14}}">{{$__amber_15 := .Repo.Name}}{{$__amber_15}}</a>
 						<span>/</span>
 						<a href="{{"#"}}">{{.Branch}}</a>
-					</h1>{{$__amber_16 := .Repo.Name}}{{$__amber_17 := .Repo.Owner}}{{$__amber_18 := .Repo.Remote}}{{$__amber_19 := __amber_add "/" $__amber_18}}{{$__amber_20 := __amber_add $__amber_19 "/"}}{{$__amber_21 := __amber_add $__amber_20 $__amber_17}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_16}}{{$__amber_24 := __amber_add $__amber_23 "/settings"}}
+					</h1>{{$__amber_16 := .Repo.Name}}{{$__amber_17 := .Repo.Owner}}{{$__amber_18 := .Repo.Host}}{{$__amber_19 := __amber_add "/" $__amber_18}}{{$__amber_20 := __amber_add $__amber_19 "/"}}{{$__amber_21 := __amber_add $__amber_20 $__amber_17}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_16}}{{$__amber_24 := __amber_add $__amber_23 "/settings"}}
 					<a class="{{"pure-button"}}" href="{{$__amber_24}}">
 						<i class="{{"fa"}} {{"fa-cog"}}"></i>
 					</a>
 				</header>
 				<section class="{{"pure-u-3-5"}}">{{$repo := .Repo}}{{$branch := .Branch}}
-					<div class="{{"commit-list"}}">{{range $commit := .Commits}}{{$__amber_25 := $repo.Name}}{{$__amber_26 := $repo.Owner}}{{$__amber_27 := $repo.Remote}}{{$__amber_28 := __amber_add "/" $__amber_27}}{{$__amber_29 := __amber_add $__amber_28 "/"}}{{$__amber_30 := __amber_add $__amber_29 $__amber_26}}{{$__amber_31 := __amber_add $__amber_30 "/"}}{{$__amber_32 := __amber_add $__amber_31 $__amber_25}}{{$__amber_33 := __amber_add $__amber_32 "/branch/"}}{{$__amber_34 := __amber_add $__amber_33 .Branch}}{{$__amber_35 := __amber_add $__amber_34 "/commit/"}}{{$__amber_36 := __amber_add $__amber_35 .Sha}}
+					<div class="{{"commit-list"}}">{{range $commit := .Commits}}{{$__amber_25 := $repo.Name}}{{$__amber_26 := $repo.Owner}}{{$__amber_27 := $repo.Host}}{{$__amber_28 := __amber_add "/" $__amber_27}}{{$__amber_29 := __amber_add $__amber_28 "/"}}{{$__amber_30 := __amber_add $__amber_29 $__amber_26}}{{$__amber_31 := __amber_add $__amber_30 "/"}}{{$__amber_32 := __amber_add $__amber_31 $__amber_25}}{{$__amber_33 := __amber_add $__amber_32 "/branch/"}}{{$__amber_34 := __amber_add $__amber_33 .Branch}}{{$__amber_35 := __amber_add $__amber_34 "/commit/"}}{{$__amber_36 := __amber_add $__amber_35 .Sha}}
 						<a class="{{"pure-g"}} {{"commit-item"}}" data-status="{{.Status}}" href="{{$__amber_36}}">
 							<div class="{{"pure-u-1-8"}}">{{$__amber_37 := __amber_add "https://secure.gravatar.com/avatar/" .Gravatar}}{{$__amber_38 := __amber_add $__amber_37 "?s=48&d=identicon"}}
 								<img src="{{$__amber_38}}" />
diff --git a/server/template/html/repo_commit.html b/server/template/html/repo_commit.html
index 7b27dbf27..0b5a52c13 100644
--- a/server/template/html/repo_commit.html
+++ b/server/template/html/repo_commit.html
@@ -27,11 +27,11 @@
 				<header class="{{"pure-u-1"}}">
 					<h1>
 						<span>{{$__amber_7 := .Repo.Owner}}{{$__amber_7}}</span>
-						<span>/</span>{{$__amber_8 := .Repo.Name}}{{$__amber_9 := .Repo.Owner}}{{$__amber_10 := .Repo.Remote}}{{$__amber_11 := __amber_add "/" $__amber_10}}{{$__amber_12 := __amber_add $__amber_11 "/"}}{{$__amber_13 := __amber_add $__amber_12 $__amber_9}}{{$__amber_14 := __amber_add $__amber_13 "/"}}{{$__amber_15 := __amber_add $__amber_14 $__amber_8}}
+						<span>/</span>{{$__amber_8 := .Repo.Name}}{{$__amber_9 := .Repo.Owner}}{{$__amber_10 := .Repo.Host}}{{$__amber_11 := __amber_add "/" $__amber_10}}{{$__amber_12 := __amber_add $__amber_11 "/"}}{{$__amber_13 := __amber_add $__amber_12 $__amber_9}}{{$__amber_14 := __amber_add $__amber_13 "/"}}{{$__amber_15 := __amber_add $__amber_14 $__amber_8}}
 						<a href="{{$__amber_15}}">{{$__amber_16 := .Repo.Name}}{{$__amber_16}}</a>
 						<span>/</span>
 						<a href="{{"#"}}">{{$__amber_17 := .Commit.ShaShort}}{{$__amber_17}}</a>
-					</h1>{{$__amber_18 := .Repo.Name}}{{$__amber_19 := .Repo.Owner}}{{$__amber_20 := .Repo.Remote}}{{$__amber_21 := __amber_add "/" $__amber_20}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_19}}{{$__amber_24 := __amber_add $__amber_23 "/"}}{{$__amber_25 := __amber_add $__amber_24 $__amber_18}}
+					</h1>{{$__amber_18 := .Repo.Name}}{{$__amber_19 := .Repo.Owner}}{{$__amber_20 := .Repo.Host}}{{$__amber_21 := __amber_add "/" $__amber_20}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_19}}{{$__amber_24 := __amber_add $__amber_23 "/"}}{{$__amber_25 := __amber_add $__amber_24 $__amber_18}}
 					<a class="{{"pure-button"}}" href="{{$__amber_25}}">
 						<i class="{{"fa"}} {{"fa-dashboard"}}"></i>
 					</a>
@@ -100,7 +100,7 @@
 			});
 		</script>{{else}}
 		<script>
-			{{$__amber_43 := .Repo.Remote}}{{$__amber_44 := .Repo.Owner}}{{$__amber_45 := .Repo.Name}}{{$__amber_46 := .Commit.Branch}}{{$__amber_47 := .Commit.Sha}}$.get("/v1/repos/"+{{$__amber_43}}+"/"+{{$__amber_44}}+"/"+{{$__amber_45}}+"/branches/"+{{$__amber_46}}+"/commits/"+{{$__amber_47}}+"/builds/1/console", function( data ) {
+			{{$__amber_43 := .Repo.Host}}{{$__amber_44 := .Repo.Owner}}{{$__amber_45 := .Repo.Name}}{{$__amber_46 := .Commit.Branch}}{{$__amber_47 := .Commit.Sha}}$.get("/v1/repos/"+{{$__amber_43}}+"/"+{{$__amber_44}}+"/"+{{$__amber_45}}+"/branches/"+{{$__amber_46}}+"/commits/"+{{$__amber_47}}+"/console", function( data ) {
 				var lineFormatter = new Drone.LineFormatter();
 				$( "#stdout" ).html(lineFormatter.format(data));
 			});
diff --git a/server/template/html/repo_conf.html b/server/template/html/repo_conf.html
index be96101b1..afd34593a 100644
--- a/server/template/html/repo_conf.html
+++ b/server/template/html/repo_conf.html
@@ -27,11 +27,11 @@
 				<header class="{{"pure-u-1"}}">
 					<h1>
 						<span>{{$__amber_6 := .Repo.Owner}}{{$__amber_6}}</span>
-						<span>/</span>{{$__amber_7 := .Repo.Name}}{{$__amber_8 := .Repo.Owner}}{{$__amber_9 := .Repo.Remote}}{{$__amber_10 := __amber_add "/" $__amber_9}}{{$__amber_11 := __amber_add $__amber_10 "/"}}{{$__amber_12 := __amber_add $__amber_11 $__amber_8}}{{$__amber_13 := __amber_add $__amber_12 "/"}}{{$__amber_14 := __amber_add $__amber_13 $__amber_7}}
+						<span>/</span>{{$__amber_7 := .Repo.Name}}{{$__amber_8 := .Repo.Owner}}{{$__amber_9 := .Repo.Host}}{{$__amber_10 := __amber_add "/" $__amber_9}}{{$__amber_11 := __amber_add $__amber_10 "/"}}{{$__amber_12 := __amber_add $__amber_11 $__amber_8}}{{$__amber_13 := __amber_add $__amber_12 "/"}}{{$__amber_14 := __amber_add $__amber_13 $__amber_7}}
 						<a href="{{$__amber_14}}">{{$__amber_15 := .Repo.Name}}{{$__amber_15}}</a>
 						<span>/</span>
 						<a href="{{"#"}}">settings</a>
-					</h1>{{$__amber_16 := .Repo.Name}}{{$__amber_17 := .Repo.Owner}}{{$__amber_18 := .Repo.Remote}}{{$__amber_19 := __amber_add "/" $__amber_18}}{{$__amber_20 := __amber_add $__amber_19 "/"}}{{$__amber_21 := __amber_add $__amber_20 $__amber_17}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_16}}
+					</h1>{{$__amber_16 := .Repo.Name}}{{$__amber_17 := .Repo.Owner}}{{$__amber_18 := .Repo.Host}}{{$__amber_19 := __amber_add "/" $__amber_18}}{{$__amber_20 := __amber_add $__amber_19 "/"}}{{$__amber_21 := __amber_add $__amber_20 $__amber_17}}{{$__amber_22 := __amber_add $__amber_21 "/"}}{{$__amber_23 := __amber_add $__amber_22 $__amber_16}}
 					<a class="{{"pure-button"}}" href="{{$__amber_23}}">
 						<i class="{{"fa"}} {{"fa-dashboard"}}"></i>
 					</a>
@@ -76,7 +76,7 @@
 							</details>
 							<details>
 								<summary>Badges</summary>
-								<textarea spellcheck="{{"false"}}">{{$__amber_34 := .Repo.Remote}}{{$__amber_35 := .Repo.Owner}}{{$__amber_36 := .Repo.Name}}{{$__amber_37 := .Repo.Remote}}{{$__amber_38 := .Repo.Owner}}{{$__amber_39 := .Repo.Name}}[![Build Status]({{.Scheme}}://{{.Host}}/v1/badge/{{$__amber_34}}/{{$__amber_35}}/{{$__amber_36}}/status.svg)]({{.Scheme}}://{{.Host}}/{{$__amber_37}}/{{$__amber_38}}/{{$__amber_39}})</textarea>
+								<textarea spellcheck="{{"false"}}">{{$__amber_34 := .Repo.Host}}{{$__amber_35 := .Repo.Owner}}{{$__amber_36 := .Repo.Name}}{{$__amber_37 := .Repo.Host}}{{$__amber_38 := .Repo.Owner}}{{$__amber_39 := .Repo.Name}}[![Build Status]({{.Scheme}}://{{.Host}}/v1/badge/{{$__amber_34}}/{{$__amber_35}}/{{$__amber_36}}/status.svg)]({{.Scheme}}://{{.Host}}/{{$__amber_37}}/{{$__amber_38}}/{{$__amber_39}})</textarea>
 							</details>
 							<details>
 								<summary>Private Variables</summary>
diff --git a/server/template/repo_branch.amber b/server/template/repo_branch.amber
index 08d7430a7..b569739b7 100644
--- a/server/template/repo_branch.amber
+++ b/server/template/repo_branch.amber
@@ -9,10 +9,10 @@ block content
 			h1
 				span #{Repo.Owner}
 				span /
-				a[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name] #{Repo.Name}
+				a[href="/"+Repo.Host+"/"+Repo.Owner+"/"+Repo.Name] #{Repo.Name}
 				span /
 				a[href="#"] #{Branch}
-			a.pure-button[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name+"/settings"]
+			a.pure-button[href="/"+Repo.Host+"/"+Repo.Owner+"/"+Repo.Name+"/settings"]
 				i.fa.fa-cog
 
 		section.pure-u-3-5
@@ -20,7 +20,7 @@ block content
 			$branch=Branch
 			div.commit-list
 				each $commit in Commits
-					a.pure-g.commit-item[data-status=Status][href="/"+$repo.Remote+"/"+$repo.Owner+"/"+$repo.Name+"/branch/"+Branch+"/commit/"+Sha]
+					a.pure-g.commit-item[data-status=Status][href="/"+$repo.Host+"/"+$repo.Owner+"/"+$repo.Name+"/branch/"+Branch+"/commit/"+Sha]
 						div.pure-u-1-8
 							img[src="https://secure.gravatar.com/avatar/"+Gravatar+"?s=48&d=identicon"]
 
diff --git a/server/template/repo_commit.amber b/server/template/repo_commit.amber
index c43168289..bc51d0ea9 100644
--- a/server/template/repo_commit.amber
+++ b/server/template/repo_commit.amber
@@ -9,11 +9,11 @@ block content
 			h1
 				span #{Repo.Owner}
 				span /
-				a[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name] #{Repo.Name}
+				a[href="/"+Repo.Host+"/"+Repo.Owner+"/"+Repo.Name] #{Repo.Name}
 				span /
 				a[href="#"] #{Commit.ShaShort}
 
-			a.pure-button[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name]
+			a.pure-button[href="/"+Repo.Host+"/"+Repo.Owner+"/"+Repo.Name]
 				i.fa.fa-dashboard
 		section.pure-u-3-4
 			div.alert[data-status=Commit.Status]
@@ -71,7 +71,7 @@ block append scripts
 			});
 	else
 		script
-			$.get("/v1/repos/"+#{Repo.Remote}+"/"+#{Repo.Owner}+"/"+#{Repo.Name}+"/branches/"+#{Commit.Branch}+"/commits/"+#{Commit.Sha}+"/console", function( data ) {
+			$.get("/v1/repos/"+#{Repo.Host}+"/"+#{Repo.Owner}+"/"+#{Repo.Name}+"/branches/"+#{Commit.Branch}+"/commits/"+#{Commit.Sha}+"/console", function( data ) {
 				var lineFormatter = new Drone.LineFormatter();
 				$( "#stdout" ).html(lineFormatter.format(data));
 			});
diff --git a/server/template/repo_conf.amber b/server/template/repo_conf.amber
index 35c7da17f..5f8a6a8a7 100644
--- a/server/template/repo_conf.amber
+++ b/server/template/repo_conf.amber
@@ -9,10 +9,10 @@ block content
 			h1
 				span #{Repo.Owner}
 				span /
-				a[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name] #{Repo.Name}
+				a[href="/"+Repo.Host+"/"+Repo.Owner+"/"+Repo.Name] #{Repo.Name}
 				span /
 				a[href="#"] settings
-			a.pure-button[href="/"+Repo.Remote+"/"+Repo.Owner+"/"+Repo.Name]
+			a.pure-button[href="/"+Repo.Host+"/"+Repo.Owner+"/"+Repo.Name]
 				i.fa.fa-dashboard
 
 		section.pure-u-1
@@ -42,7 +42,7 @@ block content
 							span Pull Request Hooks
 					details
 						summary Badges
-						textarea[spellcheck="false"] [![Build Status](#{Scheme}://#{Host}/v1/badge/#{Repo.Remote}/#{Repo.Owner}/#{Repo.Name}/status.svg)](#{Scheme}://#{Host}/#{Repo.Remote}/#{Repo.Owner}/#{Repo.Name})
+						textarea[spellcheck="false"] [![Build Status](#{Scheme}://#{Host}/v1/badge/#{Repo.Host}/#{Repo.Owner}/#{Repo.Name}/status.svg)](#{Scheme}://#{Host}/#{Repo.Host}/#{Repo.Owner}/#{Repo.Name})
 					details
 						summary Private Variables
 						textarea[spellcheck="false"][placeholder="FOO: BAR"][name="params"] #{Repo.Params}