diff --git a/Dockerfile b/Dockerfile
index 3f7dcf86..f06e28b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,10 @@ RUN apt-get update && apt-get -y install \
   curl -sL https://deb.nodesource.com/setup_12.x  | bash - && \
   apt-get -y install \
   nodejs \
-  npm && \
+  # YARN: brings along npm, solves dependency conflicts,
+  # spares us this spaghetti approach: https://stackoverflow.com/a/60547197
+  yarn && \
+  apt-get install -f && \
   npm install -g @angular/cli
 
 WORKDIR /build
@@ -35,12 +38,13 @@ ENV UID=1000 \
 
 RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
 
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
-  apt-get update && apt-get -y install \
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN apt-get update && apt-get -y install \
   npm \
   python2 \
   python3 \
-  atomicparsley
+  atomicparsley && \
+  apt-get install -f
 
 WORKDIR /app
 COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg