diff --git a/docker/build/cpu-amd64/Dockerfile b/docker/build/cpu-amd64/Dockerfile
index e4242745fc8..711b01ccd49 100644
--- a/docker/build/cpu-amd64/Dockerfile
+++ b/docker/build/cpu-amd64/Dockerfile
@@ -1,17 +1,14 @@
-FROM opendatacam/base-desktop-nvidia-cuda-opencv-gstreamer:1.0
+FROM ubuntu:20.04 as builder
 
-ENV DEBIAN_FRONTEND noninteractive
+LABEL maintainer="OpenDataCam <info@opendata.cam>"
 
-# Update NVIDIA Signing key
-# See also https://forums.developer.nvidia.com/t/gpg-error-http-developer-download-nvidia-com-compute-cuda-repos-ubuntu1804-x86-64/212904/3
-RUN apt-key del 7fa2af80 && \
-    apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/3bf863cc.pub
+ENV DEBIAN_FRONTEND noninteractive
 
 # Install commonly used dependencies
-RUN apt-get update && \
-    apt-get install -y jq wget
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
-    apt-get install -y nodejs
+RUN apt-get update \
+      && apt-get install --no-install-recommends --no-install-suggests -y gnupg2 ca-certificates \
+            git build-essential libopencv-dev wget pkg-config \
+      && rm -rf /var/lib/apt/lists/*
 
 # Start Darknet Install
 RUN git clone --depth 1 https://github.com/opendatacam/darknet /var/local/darknet
@@ -20,3 +17,18 @@ RUN sed -i -e s/AVX=0/AVX=1/ Makefile;
 RUN sed -i -e s/OPENMP=0/OPENMP=1/ Makefile;
 RUN sed -i -e s/OPENCV=0/OPENCV=1/ Makefile;
 RUN make -j
+
+# --------------------------------------------------------------------------------------------------
+
+FROM ubuntu:20.04
+
+LABEL maintainer="OpenDataCam <info@opendata.cam>"
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update \
+      && apt-get install --no-install-recommends --no-install-suggests -y libopencv-highgui4.2 \
+      && rm -rf /var/lib/apt/lists/* \
+      && apt-get clean
+
+COPY --from=builder /var/local/darknet /var/local/darknet
\ No newline at end of file
diff --git a/docker/build/desktop/Dockerfile b/docker/build/desktop/Dockerfile
index 999963b62d4..326a23fb77e 100644
--- a/docker/build/desktop/Dockerfile
+++ b/docker/build/desktop/Dockerfile
@@ -31,11 +31,4 @@ RUN apt-get update \
       && rm -rf /var/lib/apt/lists/* \
       && apt-get clean
 
-RUN apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y curl \
-    && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-    && apt-get install --no-install-recommends --no-install-suggests -y nodejs \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
 COPY --from=builder /var/local/darknet /var/local/darknet
diff --git a/docker/build/nano/Dockerfile b/docker/build/nano/Dockerfile
index 415d19bb922..63338090e78 100644
--- a/docker/build/nano/Dockerfile
+++ b/docker/build/nano/Dockerfile
@@ -90,11 +90,4 @@ RUN apt-get update \
       && rm -rf /var/lib/apt/lists/* \
       && apt-get clean
 
-RUN apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y curl \
-    && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-    && apt-get install --no-install-recommends --no-install-suggests -y nodejs \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
 COPY --from=builder /var/local/darknet /var/local/darknet
diff --git a/docker/build/xavier/Dockerfile b/docker/build/xavier/Dockerfile
index df2d6a60ab9..e8a880a4920 100644
--- a/docker/build/xavier/Dockerfile
+++ b/docker/build/xavier/Dockerfile
@@ -90,11 +90,4 @@ RUN apt-get update \
       && rm -rf /var/lib/apt/lists/* \
       && apt-get clean
 
-RUN apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y curl \
-    && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
-    && apt-get install --no-install-recommends --no-install-suggests -y nodejs \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
 COPY --from=builder /var/local/darknet /var/local/darknet