diff --git a/extras/docker/Dockerfile b/extras/docker/Dockerfile
index 05a61b3..64feab9 100644
--- a/extras/docker/Dockerfile
+++ b/extras/docker/Dockerfile
@@ -4,28 +4,29 @@
 # This creates an Ubuntu derived base image and installs the tomb libarary
 # along with it's dependencies.
 
-FROM ubuntu:bionic
+FROM dyne/devuan:beowulf
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG TOMB_VERSION=2.5
+ARG TOMB_VERSION=2.9
 
 # Install dependencies
 RUN apt-get update -y && \
-	apt-get install -y \
+	apt-get install -y -q --no-install-recommends\
+	make \
 	sudo \
 	curl \
 	rsync \
-	build-essential \
-	gettext \
 	zsh \
 	gnupg \
 	cryptsetup \
 	pinentry-curses \
-	steghide
+	steghide \
+	mlocate \
+	swish-e
 
 # Build and install Tomb from remote repo
-RUN curl https://files.dyne.org/tomb/Tomb-$TOMB_VERSION.tar.gz -o /tmp/Tomb-$TOMB_VERSION.tar.gz && \
+RUN curl https://files.dyne.org/tomb/releases/Tomb-$TOMB_VERSION.tar.gz -o /tmp/Tomb-$TOMB_VERSION.tar.gz && \
 	cd /tmp && \
 	tar -zxvf /tmp/Tomb-$TOMB_VERSION.tar.gz && \
 	cd /tmp/Tomb-$TOMB_VERSION && \
-	make install
\ No newline at end of file
+	make install