diff --git a/contrib/build-base.Dockerfile b/contrib/build-base.Dockerfile
index 1b3cd3535..17259793f 100644
--- a/contrib/build-base.Dockerfile
+++ b/contrib/build-base.Dockerfile
@@ -2,5 +2,23 @@ FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git jq build-essential wget ruby-dev lintian python3 rpm help2man man-db sudo
+RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install \
+    adduser \
+    build-essential \
+    ca-certificates \
+    coreutils \
+    curl \
+    gcc \
+    git \
+    help2man \
+    jq \
+    libc-bin \
+    lintian \
+    man-db \
+    openssh-client \
+    python3 \
+    rpm \
+    ruby-dev \
+    sudo \
+    wget
 RUN command -v fpm || gem install fpm
diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile
index 4c596958e..0bb514c75 100644
--- a/contrib/build-dokku.Dockerfile
+++ b/contrib/build-dokku.Dockerfile
@@ -1,4 +1,4 @@
-FROM dokku/build-base:0.2.0 AS builder
+FROM dokku/build-base:0.2.1 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/deb.mk b/deb.mk
index 546a98c3f..528c0177e 100644
--- a/deb.mk
+++ b/deb.mk
@@ -27,7 +27,7 @@ deb-all: deb-setup deb-dokku
 deb-setup:
 	@echo "-> Updating deb repository and installing build requirements"
 	@sudo apt-get update -qq >/dev/null
-	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev ruby1.9.1 lintian >/dev/null 2>&1
+	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev lintian >/dev/null 2>&1
 	@command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 	@ssh -o StrictHostKeyChecking=no git@github.com || true