diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index 118fae6b..8ce3ed57 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -21,7 +21,8 @@ RUN apk add --update --no-cache wget musl-dev && \
   gn \
   tar \
   ninja && \
-  apk upgrade
+  apk upgrade && \
+  npm install -g pnpm
 
 RUN rustup-init -y && \
   yarn global add pnpm && \
diff --git a/debian.Dockerfile b/debian.Dockerfile
index 0df377a2..77739546 100644
--- a/debian.Dockerfile
+++ b/debian.Dockerfile
@@ -1,23 +1,50 @@
-FROM node:lts
+FROM node:lts-stretch
+
+ARG NASM_VERSION=2.15.05
 
 ENV RUSTUP_HOME=/usr/local/rustup \
   CARGO_HOME=/usr/local/cargo \
-  PATH=/usr/local/cargo/bin:$PATH
+  PATH=/usr/local/cargo/bin:$PATH \
+  CC=clang \
+  CXX=clang++
 
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-  echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster main" >> /etc/apt/sources.list && \
+  echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch main" >> /etc/apt/sources.list && \
+  echo "deb-src http://apt.llvm.org/stretch/ llvm-toolchain-stretch main" >> /etc/apt/sources.list && \
   apt-get update && \
-  apt-get install -y --fix-missing \
+  apt-get install -y --fix-missing --no-install-recommends \
   llvm \
   clang \
+  lld \
   rcs \
-  cmake \
   gcc-aarch64-linux-gnu \
   g++-aarch64-linux-gnu \
   gcc-arm-linux-gnueabihf \
   g++-arm-linux-gnueabihf \
   ninja-build && \
+  echo 'deb http://deb.debian.org/debian testing main' >> /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get upgrade -y && \
+  apt-get autoremove -y && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y && \
   rustup target add aarch64-unknown-linux-gnu && \
-  rustup target add armv7-unknown-linux-gnueabihf
+  rustup target add armv7-unknown-linux-gnueabihf && \
+  npm install -g pnpm
+
+RUN wget https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.xz && \
+  tar -xf nasm-${NASM_VERSION}.tar.xz && \
+  cd nasm-${NASM_VERSION} && \
+  ./configure --prefix=/usr/ && \
+  make && \
+  make install && \
+  cd / && \
+  rm -rf nasm-${NASM_VERSION} && \
+  rm nasm-${NASM_VERSION}.tar.xz
+
+RUN git clone --branch release https://github.com/Kitware/CMake.git --depth 1 && \
+  cd CMake && \
+  ./bootstrap && \
+  make -j 8 && \
+  make install && \
+  cd .. && \
+  rm -rf CMake
\ No newline at end of file