diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index 1df4e5720a..069dda8b64 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -26,7 +26,7 @@ FROM golang:1.11-stretch AS build-env
 
 LABEL maintainer="infra-root@openstack.org"
 
-ARG GITEA_VERSION=opendev-1.8.0
+ARG GITEA_VERSION=6eb53ac570ab9af51fc9cbd79f1db782edce57e0
 ENV TAGS "bindata $TAGS"
 
 #Build deps
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get -y install build-essential git \
   && mkdir -p ${GOPATH}/src/code.gitea.io/gitea
 
 #Setup repo
-RUN git clone https://github.com/jeblair/gitea ${GOPATH}/src/code.gitea.io/gitea
+RUN git clone https://github.com/go-gitea/gitea ${GOPATH}/src/code.gitea.io/gitea
 WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 
 #Checkout version if set
@@ -69,7 +69,7 @@ RUN addgroup --system --gid 1000 git \
   && mkdir /custom
 
 # Copy the /etc config files and entrypoint script
-COPY --from=build-env /go/src/code.gitea.io/gitea/docker /
+COPY --from=build-env /go/src/code.gitea.io/gitea/docker/root /
 # Copy our custom sshd_config
 COPY sshd_config /etc/ssh/sshd_config