diff --git a/Makefile b/Makefile
index 7b7094b..e974752 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ REGISTRY := r.j3ss.co
 .PHONY: image
 image: ## Build a Dockerfile (ex. DIR=telnet).
 	@:$(call check_defined, DIR, directory of the Dockefile)
-	docker build --rm --force-rm -t $(REGISTRY)/$(subst /,:,$(DIR)) ./$(DIR)
+	docker build --rm --force-rm -t $(REGISTRY)/$(subst /,:,$(patsubst %/,%,$(DIR))) ./$(DIR)
 
 .PHONY: test
 test: dockerfiles shellcheck ## Runs the tests on the repository.
diff --git a/irssi/Dockerfile b/irssi/Dockerfile
index 58cca99..2564122 100644
--- a/irssi/Dockerfile
+++ b/irssi/Dockerfile
@@ -1,7 +1,6 @@
 FROM alpine:latest
 
 RUN apk --no-cache add \
-	--repository http://dl-cdn.alpinelinux.org/alpine/latest-stable/community \
 	ca-certificates \
 	perl-datetime \
 	perl-timedate
diff --git a/k8scan/main.go b/k8scan/main.go
index 816702f..ff3fb9f 100644
--- a/k8scan/main.go
+++ b/k8scan/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"errors"
@@ -407,7 +408,7 @@ func inc(ip net.IP) {
 func sendEmail(uri, ip string, port int, arinInfo ARINResponse) error {
 	mailgunClient := mailgun.NewMailgun(mailgunDomain, mailgunAPIKey)
 
-	msg, _, err := mailgunClient.Send(mailgunClient.NewMessage(
+	msg, _, err := mailgunClient.Send(context.Background(), mailgunClient.NewMessage(
 		/* From */ fmt.Sprintf("%s <%s>", emailSender, emailSender),
 		/* Subject */ fmt.Sprintf("[k8scan]: found dashboard %s", uri),
 		/* Body */ fmt.Sprintf(`Time: %s
diff --git a/keepass2/Dockerfile b/keepass2/Dockerfile
index 22a2c4b..9a62570 100644
--- a/keepass2/Dockerfile
+++ b/keepass2/Dockerfile
@@ -26,7 +26,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
 	keepass2 \
 	xdotool \
-	mono-dmcs \
+	mono-mcs \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/nomad/Dockerfile b/nomad/Dockerfile
index 379112a..2089de5 100644
--- a/nomad/Dockerfile
+++ b/nomad/Dockerfile
@@ -9,6 +9,7 @@ RUN	apk add --no-cache \
 	ca-certificates \
 	gcc \
 	git \
+	g++ \
 	libgcc \
 	linux-headers \
 	make \
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index dba20f8..2cfc444 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -14,9 +14,9 @@ RUN apk add --no-cache \
 		--repository https://dl-4.alpinelinux.org/alpine/edge/testing
 
 # https://github.com/Radarr/Radarr/releases
-ENV RADARR_VERSION v0.2.0.1293
+ENV RADARR_VERSION 0.2.0.1293
 RUN mkdir -p /opt/radarr \
-	&& wget "https://github.com/Radarr/Radarr/releases/download/${RADARR_VERSION}/Radarr.${RADARR_VERSION}.linux.tar.gz" -O /tmp/radarr.tar.gz \
+	&& wget "https://github.com/Radarr/Radarr/releases/download/v${RADARR_VERSION}/Radarr.develop.${RADARR_VERSION}.linux.tar.gz" -O /tmp/radarr.tar.gz \
 	&& tar -xzvf /tmp/radarr.tar.gz -C /opt/radarr --strip-components 1 \
 	&& rm -rf /tmp/radarr.tar.gz
 
diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile
index 6d49865..96ab201 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/projects/torbrowser.html.en
-ENV TOR_VERSION 8.5a6
+ENV TOR_VERSION 8.5a8
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature
diff --git a/zookeeper/3.4/Dockerfile b/zookeeper/3.4/Dockerfile
index b2124b5..8cb5266 100644
--- a/zookeeper/3.4/Dockerfile
+++ b/zookeeper/3.4/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-alpine
 
-ENV ZOOKEEPER_VERSION 3.4.12
+ENV ZOOKEEPER_VERSION 3.4.13
 ENV PATH $PATH:/opt/zookeeper/bin/
 
 # the start files for zookeeper use bash
@@ -14,7 +14,7 @@ RUN buildDeps=' \
 	&& apk --no-cache add --virtual build-deps $buildDeps \
 	&& echo "==> Downloading Zookeeper..." \
 	&& mkdir -p /opt \
-	&& curl -sSL "http://apache.mirrors.pair.com/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
+	&& curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
 	&& mv /opt/zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
 	&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
 	&& apk del build-deps
diff --git a/zookeeper/3.5/Dockerfile b/zookeeper/3.5/Dockerfile
index a13fde4..dea9ff4 100644
--- a/zookeeper/3.5/Dockerfile
+++ b/zookeeper/3.5/Dockerfile
@@ -1,6 +1,6 @@
 FROM java:8-alpine
 
-ENV ZOOKEEPER_VERSION 3.5.4
+ENV ZOOKEEPER_VERSION 3.5.4-beta
 ENV PATH $PATH:/opt/zookeeper/bin/
 
 # the start files for zookeeper use bash
@@ -15,7 +15,7 @@ RUN buildDeps=' \
 	&& apk --no-cache add --virtual build-deps $buildDeps \
 	&& echo "==> Downloading Zookeeper..." \
 	&& mkdir -p /opt \
-	&& curl -sSL "http://apache.mirrors.pair.com/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
+	&& curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
 	&& mv /opt/zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
 	&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
 	&& apk del build-deps