diff --git a/nes/Dockerfile b/nes/Dockerfile
index 73e939d..8c74cbf 100644
--- a/nes/Dockerfile
+++ b/nes/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \
 	libgl1-mesa-dev \
 	libgl1-mesa-dri \
 	libxcursor-dev \
+	libxxf86vm-dev \
 	libxi-dev \
 	libxinerama-dev \
 	libxrandr-dev \
diff --git a/tor-browser/stable/Dockerfile b/tor-browser/stable/Dockerfile
index 7f1375b..0999108 100644
--- a/tor-browser/stable/Dockerfile
+++ b/tor-browser/stable/Dockerfile
@@ -34,7 +34,7 @@ RUN useradd --create-home --home-dir $HOME user \
 ENV LANG C.UTF-8
 
 # https://www.torproject.org/projects/torbrowser.html.en
-ENV TOR_VERSION 9.0.7
+ENV TOR_VERSION 9.0.10
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature
diff --git a/vault/Dockerfile b/vault/Dockerfile
index 1f3a4bf..b27f585 100644
--- a/vault/Dockerfile
+++ b/vault/Dockerfile
@@ -1,18 +1,32 @@
-FROM golang:alpine as builder
+FROM golang:latest as builder
 LABEL maintainer="Jessica Frazelle <jess@linux.com>"
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-RUN	apk add --no-cache \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
-	bash \
+RUN apt-get update && apt-get install -y \
+	apt-transport-https \
 	ca-certificates \
+	curl \
+    --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/* \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
+RUN apt-get update && apt-get install -y \
+	gcc \
 	git \
+	g++ \
 	make \
-	npm \
+	nodejs \
+	pkgconf \
+	python \
 	yarn \
-	zip
+	zip \
+    --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV VAULT_VERSION v1.4.1
 
diff --git a/weechat-matrix/Dockerfile b/weechat-matrix/Dockerfile
index fba89b4..707b15d 100644
--- a/weechat-matrix/Dockerfile
+++ b/weechat-matrix/Dockerfile
@@ -19,9 +19,10 @@ RUN apk add --no-cache \
 	git \
 	libffi-dev \
 	libressl-dev \
-	python \
-	python-dev \
-	py2-pip \
+	olm-dev \
+	python3 \
+	python3-dev \
+	py3-pip \
 	weechat \
 	weechat-perl \
 	weechat-python \
@@ -34,8 +35,8 @@ RUN adduser -S user -h $HOME \
 	&& cd $HOME \
 	&& git clone https://github.com/poljar/weechat-matrix.git \
 	&& cd weechat-matrix \
-	&& pip install -r requirements.txt \
-	&& pip install websocket-client \
+	&& pip3 install -r requirements.txt \
+	&& pip3 install websocket-client \
 	&& make install \
 	&& chown -R user $HOME