diff --git a/api/Dockerfile b/api/Dockerfile
index 268d713..8e2b7eb 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,7 +1,9 @@
-FROM node:15.8.0-alpine3.13
-RUN apk add --no-cache gnupg tar bash coreutils shadow util-linux
-RUN userdel -r node
-RUN for i in $(seq 1000 1500); do \
+FROM node:15.8.0-buster-slim
+RUN dpkg-reconfigure -p critical dash
+RUN apt-get update && apt-get install -y gnupg tar coreutils util-linux \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN for i in $(seq 1001 1500); do \
         groupadd -g $i runner$i && \
         useradd -M runner$i -g $i -u $i ; \
     done
diff --git a/repo/Dockerfile b/repo/Dockerfile
index d49182e..730b8f1 100644
--- a/repo/Dockerfile
+++ b/repo/Dockerfile
@@ -1,7 +1,8 @@
-FROM alpine:3.13
+FROM debian:buster-slim
 
-RUN apk add --no-cache python3 py3-pip gnupg jq zlib zlib-dev cmake cmake-doc extra-cmake-modules extra-cmake-modules-doc build-base gcc abuild binutils binutils-doc gcc-doc yq bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep && \
+RUN apt-get update && apt-get install -y bc curl git linux-headers-amd64 perl xz-utils python3 python3-pip gnupg jq zlib1g-dev cmake cmake-doc extra-cmake-modules build-essential gcc binutils bash coreutils util-linux pciutils usbutils coreutils binutils findutils grep && \
         ln -sf /bin/bash /bin/sh && \
-        pip3 install 'yq==2.12.0'
+        pip3 install 'yq==2.12.0' && \
+        rm -rf /var/lib/apt/lists/*
 
 CMD [ "bash", "/repo/make.sh" ]
\ No newline at end of file