diff --git a/Dockerfile b/Dockerfile
index 7c2052e..feb813f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine
+FROM r.batts.cloud/debian:testing
 
 LABEL org.opencontainers.image.authors="philipp.heckel@gmail.com"
 LABEL org.opencontainers.image.url="https://ntfy.sh/"
diff --git a/Dockerfile-build b/Dockerfile-build
index f8af256..9c6d1bc 100644
--- a/Dockerfile-build
+++ b/Dockerfile-build
@@ -1,4 +1,4 @@
-FROM golang:1.19-bullseye as builder
+FROM r.batts.cloud/golang:1.19 as builder
 
 ARG VERSION=dev
 ARG COMMIT=unknown
@@ -8,7 +8,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash
 RUN apt-get install -y \
     build-essential \
     nodejs \
-    python3-pip
+    python3-pip \
+    python3-venv
 
 WORKDIR /app
 ADD Makefile .
@@ -36,7 +37,7 @@ ADD ./user ./user
 ADD ./util ./util
 RUN make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server
 
-FROM alpine
+FROM r.batts.cloud/debian:testing
 
 LABEL org.opencontainers.image.authors="philipp.heckel@gmail.com"
 LABEL org.opencontainers.image.url="https://ntfy.sh/"
diff --git a/Makefile b/Makefile
index 8cb7523..440bfa6 100644
--- a/Makefile
+++ b/Makefile
@@ -110,8 +110,9 @@ build-deps-ubuntu:
 
 docs: docs-deps docs-build
 
-docs-build: .PHONY
-	@if ! /bin/echo -e "import sys\nif sys.version_info < (3,8):\n exit(1)" | python3; then \
+docs-build: venv .PHONY
+	@. venv/bin/activate && \
+	if ! /bin/echo -e "import sys\nif sys.version_info < (3,8):\n exit(1)" | python3; then \
 	  if which python3.8; then \
 	  	echo "python3.8 $(shell which mkdocs) build"; \
 	    python3.8 $(shell which mkdocs) build; \
@@ -124,10 +125,15 @@ docs-build: .PHONY
 	  mkdocs build; \
 	fi
 
-docs-deps: .PHONY
+venv:
+	python3 -m venv ./venv
+
+docs-deps: venv .PHONY
+	. venv/bin/activate && \
 	pip3 install -r requirements.txt
 
-docs-deps-update: .PHONY
+docs-deps-update: venv .PHONY
+	. venv/bin/activate && \
 	pip3 install -r requirements.txt --upgrade