diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index 90e85dbda1..c3075c048c 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -22,11 +22,11 @@
 
 ###################################
 #Build stage
-FROM golang:1.11-stretch AS build-env
+FROM docker.io/library/golang:1.13-buster AS build-env
 
 LABEL maintainer="infra-root@openstack.org"
 
-ARG GITEA_VERSION=6eb53ac570ab9af51fc9cbd79f1db782edce57e0
+ARG GITEA_VERSION="v1.9.5"
 ENV TAGS "bindata $TAGS"
 
 #Build deps
@@ -44,7 +44,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 ###################################
 # Basic system setup common to all containers in our pod
 
-FROM debian:testing as base
+FROM docker.io/library/debian:buster-slim as base
 
 RUN apt-get update && apt-get -y install \
     bash \
diff --git a/docker/gitea/custom/templates/repo/header.tmpl b/docker/gitea/custom/templates/repo/header.tmpl
index d264c3682b..fe361b8aa6 100644
--- a/docker/gitea/custom/templates/repo/header.tmpl
+++ b/docker/gitea/custom/templates/repo/header.tmpl
@@ -3,7 +3,11 @@
 	<div class="ui container">
 		<div class="repo-header">
 			<div class="ui huge breadcrumb repo-title">
+				{{if .RelAvatarLink}}
+				<img class="ui avatar image" src="{{.RelAvatarLink}}">
+				{{else}}
 				<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
+				{{end}}
 				<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 				<div class="divider"> / </div>
 				<a href="{{$.RepoLink}}">{{.Name}}</a>