diff --git a/build-image.sh b/build-image.sh
index 065257d..26b081e 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -6,7 +6,3 @@ set -e
 
 docker build $1 -t gitea.angry.im/petercxy/$1:latest
 docker push gitea.angry.im/petercxy/$1:latest
-
-while ! [ "$?" -eq 0 ]; do
-  docker push gitea.angry.im/petercxy/$1:latest
-done
diff --git a/element-web/Dockerfile b/element-web/Dockerfile
index 37bf42e..14f47b6 100644
--- a/element-web/Dockerfile
+++ b/element-web/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELEMENT_VER=v1.11.23
+ARG ELEMENT_VER=v1.11.16-rc.2
 
 FROM debian:11 AS builder
 
@@ -12,7 +12,7 @@ RUN cd / && curl -k -L "https://raw.githubusercontent.com/vector-im/element-web/
     && git clone --depth=1 https://github.com/aaronraimist/element-themes \
     && node custom_config.js | tee config.json
 
-FROM docker.io/vectorim/element-web:${ELEMENT_VER}
+FROM vectorim/element-web:${ELEMENT_VER}
 
 ARG ELEMENT_VER
 
diff --git a/headscale/Dockerfile b/headscale/Dockerfile
index d8ca576..43d559c 100644
--- a/headscale/Dockerfile
+++ b/headscale/Dockerfile
@@ -1,6 +1,6 @@
 # Builder image
-FROM docker.io/golang:1.19.3-bullseye AS build
-ARG VERSION=v0.20.0
+FROM docker.io/golang:1.19.0-bullseye AS build
+ARG VERSION=v0.17.1
 ENV GOPATH /go
 
 RUN apt-get install -y git && \
@@ -17,7 +17,7 @@ RUN test -e /go/bin/headscale
 # Production image
 # Note that we do not use "distroless" because we actually want to have a shell in the image
 # to run app.sh (in order to perform custom initialization)
-FROM docker.io/golang:1.19.3-bullseye
+FROM docker.io/golang:1.19.0-bullseye
 
 COPY --from=build /go/bin/headscale /bin/headscale
 ENV TZ UTC