diff --git a/lkp-tests/Dockerfile b/lkp-tests/Dockerfile
index 1ac0b9c..953b3f2 100644
--- a/lkp-tests/Dockerfile
+++ b/lkp-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:buster-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/oauth2-proxy/Dockerfile b/oauth2-proxy/Dockerfile
index 6d983ad..4e308df 100644
--- a/oauth2-proxy/Dockerfile
+++ b/oauth2-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine as builder
+FROM golang:alpine as builder
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN	apk --no-cache add \
@@ -10,8 +10,6 @@ ENV GOPATH /go
 
 ENV OAUTH2_PROXY_VERSION v5.1.1
 
-RUN go get github.com/golang/dep/cmd/dep
-
 RUN go get github.com/pusher/oauth2_proxy || true \
 	&& cd /go/src/github.com/pusher/oauth2_proxy \
 	&& git checkout "${OAUTH2_PROXY_VERSION}" \
diff --git a/weechat-matrix/Dockerfile b/weechat-matrix/Dockerfile
index 7220c0c..fba89b4 100644
--- a/weechat-matrix/Dockerfile
+++ b/weechat-matrix/Dockerfile
@@ -19,14 +19,13 @@ RUN apk add --no-cache \
 	git \
 	libffi-dev \
 	libressl-dev \
-	olm-dev \
 	python \
 	python-dev \
 	py2-pip \
 	weechat \
 	weechat-perl \
 	weechat-python \
-	--repository https://dl-4.alpinelinux.org/alpine/edge/testing
+	--repository https://dl-4.alpinelinux.org/alpine/edge/community
 
 ENV HOME /home/user