diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index 863edd71ad..0a40451658 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -26,11 +26,15 @@ FROM docker.io/library/golang:1.13-buster AS build-env
 
 LABEL maintainer="infra-root@openstack.org"
 
-ARG GITEA_VERSION="v1.10.3"
+ARG GITEA_VERSION="v1.11.1"
 ENV TAGS "bindata $TAGS"
 
 #Build deps
-RUN apt-get update && apt-get -y install build-essential git \
+RUN apt-get update && apt-get -y install build-essential git apt-transport-https curl gnupg2 \
+  && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+  && echo "deb https://deb.nodesource.com/node_10.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && apt-get update \
+  && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs \
   && mkdir -p ${GOPATH}/src/code.gitea.io/gitea
 
 #Setup repo
diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl
index 9ed761823b..64970b0200 100644
--- a/docker/gitea/custom/templates/base/head_navbar.tmpl
+++ b/docker/gitea/custom/templates/base/head_navbar.tmpl
@@ -1,7 +1,7 @@
 <div class="ui container" id="navbar">
 	<div class="item brand" style="justify-content: space-between;">
 		<a href="{{AppSubUrl}}/">
-			<img class="ui mini image" src="{{AppSubUrl}}/img/opendev-sm.png">
+			<img class="ui mini image" src="{{StaticUrlPrefix}}/img/opendev-sm.png">
 		</a>
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
@@ -12,6 +12,7 @@
 		<a class="item {{if .PageIsDashboard}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
 		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
 		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
+		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
 		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
 	{{else if .IsLandingPageHome}}
 		<a class="item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
diff --git a/docker/gitea/custom/templates/pwa/manifest_json.tmpl b/docker/gitea/custom/templates/pwa/manifest_json.tmpl
index 3777ae596c..1a8f821ea9 100644
--- a/docker/gitea/custom/templates/pwa/manifest_json.tmpl
+++ b/docker/gitea/custom/templates/pwa/manifest_json.tmpl
@@ -3,22 +3,22 @@
     "name": "OpenDev",
     "icons": [
       {
-        "src": "{{AppSubUrl}}/img/opendev-lg.png",
+        "src": "{{StaticUrlPrefix}}/img/opendev-lg.png",
         "type": "image/png",
         "sizes": "880x880"
       },
       {
-        "src": "{{AppSubUrl}}/img/opendev-sm.png",
+        "src": "{{StaticUrlPrefix}}/img/opendev-sm.png",
         "type": "image/png",
         "sizes": "120x120"
       },
       {
-        "src": "{{AppSubUrl}}/img/opendev-512.png",
+        "src": "{{StaticUrlPrefix}}/img/opendev-512.png",
         "type": "image/png",
         "sizes": "512x512"
       },
       {
-        "src": "{{AppSubUrl}}/img/opendev-192.png",
+        "src": "{{StaticUrlPrefix}}/img/opendev-192.png",
         "type": "image/png",
         "sizes": "192x192"
       }
@@ -28,4 +28,4 @@
     "background_color": "#FAFAFA",
     "display": "standalone",
     "theme_color": "{{ThemeColorMetaTag}}"
-  }
\ No newline at end of file
+  }
diff --git a/docker/gitea/custom/templates/repo/header.tmpl b/docker/gitea/custom/templates/repo/header.tmpl
index 9f8e8ea0a0..00a2aad6bf 100644
--- a/docker/gitea/custom/templates/repo/header.tmpl
+++ b/docker/gitea/custom/templates/repo/header.tmpl
@@ -11,9 +11,11 @@
 				<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 				<div class="divider"> / </div>
 				<a href="{{$.RepoLink}}">{{.Name}}</a>
+				{{if .IsTemplate}}<i class="icon fa-copy"></i>{{end}}
 				{{if .IsArchived}}<i class="archive icon archived-icon"></i>{{end}}
-                                {{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{MirrorAddress $.Mirror}}">{{MirrorAddress $.Mirror}}</a></div>{{end}}
+				{{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}">{{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}</a></div>{{end}}
 				{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{SubStr .BaseRepo.RelLink 1 -1}}</a></div>{{end}}
+				{{if .IsGenerated}}<div class="fork-flag">{{$.i18n.Tr "repo.generated_from"}} <a href="{{.TemplateRepo.Link}}">{{SubStr .TemplateRepo.RelLink 1 -1}}</a></div>{{end}}
 			</div>
 		</div><!-- end grid -->
 	</div><!-- end container -->