diff --git a/bcc-tools/Dockerfile b/bcc-tools/Dockerfile
index 9a36306..1f70bf9 100644
--- a/bcc-tools/Dockerfile
+++ b/bcc-tools/Dockerfile
@@ -6,7 +6,7 @@
 #	-v /etc/localtime:/etc/localtime:ro \
 #	r.j3ss.co/bcc-tools
 #
-FROM debian:buster-slim
+FROM debian:stretch-slim
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /usr/share/bcc/tools:$PATH
diff --git a/clisp/Dockerfile b/clisp/Dockerfile
index 123781d..2ce7786 100644
--- a/clisp/Dockerfile
+++ b/clisp/Dockerfile
@@ -3,13 +3,15 @@ RUN apk add --no-cache \
 	git
 RUN git clone https://github.com/brendandburns/cl-k8s.git /cl-k8s
 
-FROM alpine:latest
+FROM debian:buster-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-RUN apk --no-cache add \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
+RUN apt-get update && apt-get install -y \
 	ca-certificates \
-	clisp
+	clisp \
+	wget \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 COPY .clisprc.lisp /home/user/.clisprc.lisp
 COPY --from=cl-k8s /cl-k8s /home/user/quicklisp/local-projects/cl-k8s
@@ -18,7 +20,7 @@ COPY --from=cl-k8s /cl-k8s /home/user/quicklisp/local-projects/cl-k8s
 RUN wget -O /home/user/quicklisp.lisp https://beta.quicklisp.org/quicklisp.lisp
 
 ENV HOME /home/user
-RUN adduser -u 1001 -D user \
+RUN useradd --create-home --home-dir $HOME user \
 	&& chown -R user:user $HOME
 
 USER user
diff --git a/lkp-tests/Dockerfile b/lkp-tests/Dockerfile
index c8c5fd7..1c6f866 100644
--- a/lkp-tests/Dockerfile
+++ b/lkp-tests/Dockerfile
@@ -82,10 +82,6 @@ WORKDIR /usr/src/lkp-tests
 RUN make install \
 	&& lkp install
 
-# Create the lkp user and group
-RUN groupadd --gid 1090 lkp
-RUN useradd --uid 1090 --gid 1090 lkp
-
 COPY runbench /usr/local/bin/runbench
 
 CMD [ "lkp" ]
diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile
index 96ab201..848ca9b 100644
--- a/tor-browser/alpha/Dockerfile
+++ b/tor-browser/alpha/Dockerfile
@@ -32,8 +32,8 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-# https://www.torproject.org/projects/torbrowser.html.en
-ENV TOR_VERSION 8.5a8
+# https://www.torproject.org/download/alpha/
+ENV TOR_VERSION 9.0a1
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature
diff --git a/transfer-sh/Dockerfile b/transfer-sh/Dockerfile
index 366dc42..472e477 100644
--- a/transfer-sh/Dockerfile
+++ b/transfer-sh/Dockerfile
@@ -14,7 +14,7 @@ RUN	git clone --depth 1 --branch ${TRANSFER_SH_VERSION} https://github.com/dutch
 
 WORKDIR /go/src/github.com/dutchcoders/transfer.sh
 
-RUN go build -o /usr/bin/transfer.sh
+RUN GO111MODULE=on go build -o /usr/bin/transfer.sh
 
 # Create a clean image without build dependencies
 FROM alpine:latest
diff --git a/zoom-us/Dockerfile b/zoom-us/Dockerfile
index 3e08293..72e74af 100644
--- a/zoom-us/Dockerfile
+++ b/zoom-us/Dockerfile
@@ -18,7 +18,6 @@ RUN apt-get update && apt-get install -y \
 	desktop-file-utils \
 	ibus \
 	ibus-gtk \
-	ibus-qt4 \
 	lib32z1 \
 	libx11-6 \
 	libasound2-dev \
@@ -42,7 +41,6 @@ RUN apt-get update && apt-get install -y \
 	libxcb-image0 \
 	libxcb-keysyms1 \
 	libxcb-xtest0 \
-	libibus-qt1 \
 	libnss3 \
 	libxss1 \
 	sudo \
diff --git a/zsh/Dockerfile b/zsh/Dockerfile
index 2b35f06..556ace5 100644
--- a/zsh/Dockerfile
+++ b/zsh/Dockerfile
@@ -5,9 +5,9 @@ COPY ./.zshrc /root/.zshrc
 RUN apk --no-cache add \
 	shadow \
 	zsh \
-	&& chsh -s /bin/zsh
+	&& chsh -s /bin/zsh || true
 
 ENV SHELL /usr/bin/zsh
 
 WORKDIR /root
-ENTRYPOINT /bin/zsh
+ENTRYPOINT ["/bin/zsh"]