diff --git a/bcc-tools/Dockerfile b/bcc-tools/Dockerfile
index 5393133..43fe62f 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:bullseye-slim
+FROM debian:sid-slim
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /usr/share/bcc/tools:$PATH
diff --git a/consul/Dockerfile b/consul/Dockerfile
index 65a496f..c6b1bd3 100644
--- a/consul/Dockerfile
+++ b/consul/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:latest as builder
+FROM golang:1.12 as builder
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
@@ -29,9 +29,9 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV CONSUL_VERSION v1.6.0-beta2
+ENV CONSUL_VERSION v1.6.1
 
-RUN go get github.com/hashicorp/consul
+RUN go get github.com/hashicorp/consul || true
 
 WORKDIR /go/src/github.com/hashicorp/consul
 
diff --git a/coredns/Dockerfile b/coredns/Dockerfile
index 8673470..2c99c62 100644
--- a/coredns/Dockerfile
+++ b/coredns/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.12-alpine as builder
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
diff --git a/k8scan/Dockerfile b/k8scan/Dockerfile
index cb560a1..b0d6a82 100644
--- a/k8scan/Dockerfile
+++ b/k8scan/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.12-alpine as builder
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
@@ -24,10 +24,10 @@ COPY *.go /go/src/k8scan/
 RUN set -x \
 	&& go get -d . \
 	&& gofmt -s -l . \
+	&& go test ./... \
 	&& go vet ./... \
 	&& golint ./... \
 	&& staticcheck ./... \
-	&& go test ./... \
 	&& CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' -o /usr/bin/k8scan *.go \
 	&& echo "Build complete."
 
diff --git a/oauth2-proxy/Dockerfile b/oauth2-proxy/Dockerfile
index 78215c0..fd6cd7f 100644
--- a/oauth2-proxy/Dockerfile
+++ b/oauth2-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.12-alpine as builder
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN	apk --no-cache add \
diff --git a/osquery/Dockerfile b/osquery/Dockerfile
index e774e9c..4d6206f 100644
--- a/osquery/Dockerfile
+++ b/osquery/Dockerfile
@@ -1,21 +1,31 @@
-FROM debian:bullseye-slim
+FROM ubuntu:bionic
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-RUN apt-get update && apt-get install -y \
-	ca-certificates \
-	libc++1-7 \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND noninteractive
 
-ENV OSQUERY_VERSION 4.0.0
+RUN apt-get update && apt-get install -y \
+	apt-transport-https \
+	ca-certificates \
+	curl \
+	gnupg2 \
+	libc++1 \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& curl -sSL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
+	&& echo 'deb https://apt.kitware.com/ubuntu/ bionic main' > /etc/apt/sources.list.d/cmake.list
+
+ENV OSQUERY_VERSION 4.0.2
 
 RUN buildDeps=' \
+		bison \
 		clang \
 		cmake \
+		flex \
 		git \
 		libc++-dev \
 		libc++abi-dev \
 		liblzma-dev \
+		libssl-dev \
 		llvm \
 		make \
 		python \
diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile
index 1f42dd4..142057a 100644
--- a/tor-browser/alpha/Dockerfile
+++ b/tor-browser/alpha/Dockerfile
@@ -33,7 +33,7 @@ RUN useradd --create-home --home-dir $HOME user \
 ENV LANG C.UTF-8
 
 # https://www.torproject.org/download/alpha/
-ENV TOR_VERSION 9.0a4
+ENV TOR_VERSION 9.0a6
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature