diff --git a/docker/blocks/apache_proxy/Dockerfile b/docker/blocks/apache_proxy/Dockerfile
new file mode 100644
index 00000000000..37c2a4e493b
--- /dev/null
+++ b/docker/blocks/apache_proxy/Dockerfile
@@ -0,0 +1,4 @@
+FROM jmferrer/apache2-reverse-proxy:latest
+
+COPY ports.conf /etc/apache2/sites-enabled
+COPY proxy.conf /etc/apache2/sites-enabled
\ No newline at end of file
diff --git a/docker/blocks/apache_proxy/docker-compose.yaml b/docker/blocks/apache_proxy/docker-compose.yaml
new file mode 100644
index 00000000000..2aec3d4bc4f
--- /dev/null
+++ b/docker/blocks/apache_proxy/docker-compose.yaml
@@ -0,0 +1,9 @@
+# This will proxy all requests for http://localhost:10081/grafana/ to
+# http://localhost:3000 (Grafana running locally)
+#
+# Please note that you'll need to change the root_url in the Grafana configuration:
+# root_url = %(protocol)s://%(domain)s:/grafana/
+
+  apacheproxy:
+    build: blocks/apache_proxy
+    network_mode: host
diff --git a/docker/blocks/apache_proxy/ports.conf b/docker/blocks/apache_proxy/ports.conf
new file mode 100644
index 00000000000..e7a5f9712af
--- /dev/null
+++ b/docker/blocks/apache_proxy/ports.conf
@@ -0,0 +1 @@
+Listen 10081
\ No newline at end of file
diff --git a/docker/blocks/apache_proxy/proxy.conf b/docker/blocks/apache_proxy/proxy.conf
new file mode 100644
index 00000000000..5eb35cbe8b9
--- /dev/null
+++ b/docker/blocks/apache_proxy/proxy.conf
@@ -0,0 +1,4 @@
+<VirtualHost *:10081>
+    ProxyPass /grafana/ http://localhost:3000/
+    ProxyPassReverse /grafana/ http://localhost:3000/
+</VirtualHost>
\ No newline at end of file
diff --git a/docker/blocks/nginx_proxy/Dockerfile b/docker/blocks/nginx_proxy/Dockerfile
new file mode 100644
index 00000000000..9ded20dfdda
--- /dev/null
+++ b/docker/blocks/nginx_proxy/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/docker/blocks/nginx_proxy/docker-compose.yaml b/docker/blocks/nginx_proxy/docker-compose.yaml
new file mode 100644
index 00000000000..7c3447ade5c
--- /dev/null
+++ b/docker/blocks/nginx_proxy/docker-compose.yaml
@@ -0,0 +1,9 @@
+# This will proxy all requests for http://localhost:10080/grafana/ to
+# http://localhost:3000 (Grafana running locally)
+#
+# Please note that you'll need to change the root_url in the Grafana configuration:
+# root_url = %(protocol)s://%(domain)s:/grafana/
+
+  nginxproxy:
+    build: blocks/nginx_proxy
+    network_mode: host
diff --git a/docker/blocks/nginx_proxy/nginx.conf b/docker/blocks/nginx_proxy/nginx.conf
new file mode 100644
index 00000000000..18e27b3fb01
--- /dev/null
+++ b/docker/blocks/nginx_proxy/nginx.conf
@@ -0,0 +1,19 @@
+events { worker_connections 1024; }
+
+http {
+  sendfile on;
+
+  proxy_redirect     off;
+  proxy_set_header   Host $host;
+  proxy_set_header   X-Real-IP $remote_addr;
+  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header   X-Forwarded-Host $server_name;
+
+  server {
+    listen 10080;
+
+    location /grafana/ {
+      proxy_pass http://localhost:3000/;
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/app/core/controllers/reset_password_ctrl.ts b/public/app/core/controllers/reset_password_ctrl.ts
index 38bd51d2933..bc184838803 100644
--- a/public/app/core/controllers/reset_password_ctrl.ts
+++ b/public/app/core/controllers/reset_password_ctrl.ts
@@ -17,7 +17,7 @@ export class ResetPasswordCtrl {
       main: {
         icon: 'gicon gicon-branding',
         subTitle: 'Reset your Grafana password',
-        breadcrumbs: [{ title: 'Login', url: '/login' }, { title: 'Reset Password' }],
+        breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Reset Password' }],
       },
     };
 
diff --git a/public/app/core/controllers/signup_ctrl.ts b/public/app/core/controllers/signup_ctrl.ts
index 1f47912931e..dbaca216e30 100644
--- a/public/app/core/controllers/signup_ctrl.ts
+++ b/public/app/core/controllers/signup_ctrl.ts
@@ -22,7 +22,7 @@ export class SignUpCtrl {
       main: {
         icon: 'gicon gicon-branding',
         subTitle: 'Register your Grafana account',
-        breadcrumbs: [{ title: 'Login', url: '/login' }, { title: 'Sign Up' }],
+        breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Sign Up' }],
       },
     };
 
diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts
index 1f610f51688..07d7911df1a 100644
--- a/public/app/features/plugins/plugin_edit_ctrl.ts
+++ b/public/app/features/plugins/plugin_edit_ctrl.ts
@@ -33,7 +33,7 @@ export class PluginEditCtrl {
         subTitle: model.info.author.name,
         url: '',
         text: '',
-        breadcrumbs: [{ title: 'Plugins', url: '/plugins' }, { title: model.name }],
+        breadcrumbs: [{ title: 'Plugins', url: 'plugins' }, { title: model.name }],
         children: [
           {
             icon: 'fa fa-fw fa-file-text-o',
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 29988eb8f05..54c59c04429 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -63,7 +63,7 @@
         <div class="login-signup-title p-r-1">
           New to Grafana?
         </div>
-        <a href="/signup" class="btn btn-medium btn-signup btn-p-x-2">
+        <a href="signup" class="btn btn-medium btn-signup btn-p-x-2">
           Sign Up
         </a>
       </div>
diff --git a/public/app/partials/reset_password.html b/public/app/partials/reset_password.html
index b6517a6670b..340d8f8f329 100644
--- a/public/app/partials/reset_password.html
+++ b/public/app/partials/reset_password.html
@@ -12,7 +12,7 @@
 				<button type="submit" class="btn btn-success" ng-click="sendResetEmail();" ng-disabled="!sendResetForm.$valid">
 					Reset Password
 				</button>
-				<a href="/login" class="btn btn-inverse">
+				<a href="login" class="btn btn-inverse">
 					Back
 				</a>
 
@@ -22,7 +22,7 @@
 			An email with a reset link as been sent to the email address. <br>
 			You should receive it shortly.
 			<div class="p-t-1">
-				<a href="/login" class="btn btn-success p-t-1">
+				<a href="login" class="btn btn-success p-t-1">
 					Login
 				</a>
 			</div>
diff --git a/public/app/partials/signup_step2.html b/public/app/partials/signup_step2.html
index 865c37c4c26..b01c8160b16 100644
--- a/public/app/partials/signup_step2.html
+++ b/public/app/partials/signup_step2.html
@@ -40,7 +40,7 @@
         <button type="submit" class="btn btn-success" ng-click="ctrl.submit();" ng-disabled="!signUpForm.$valid">
           Sign Up
         </button>
-        <a href="/login" class="btn btn-inverse">
+        <a href="login" class="btn btn-inverse">
             Back
         </a>
       </div>