diff --git a/Dockerfile b/Dockerfile
index 87beb32..96cc51b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,23 @@
 FROM debian:10
 
-# Install deps
+# Install kicad deps
 RUN apt-get update -q && \
-    apt-get install --no-install-recommends --no-upgrade -qqy \
-        cmake build-essential g++ \
-        libcurl4 libcurl4-gnutls-dev libboost-dev libboost-test-dev \
-        libboost-filesystem-dev libboost-regex-dev git autoconf libtool automake \
-        flex bison liboce-foundation-dev liboce-ocaf-dev\
-        ca-certificates libssl-dev ccache \
-        curl wget && \
+    apt-get install --no-upgrade -qqy \
+        git cmake build-essential curl ccache \
+        libcurl4 libcurl4-gnutls-dev \
+        libboost-dev libboost-test-dev libboost-filesystem-dev libboost-regex-dev \
+        liboce-foundation-dev liboce-ocaf-dev \
+        ca-certificates libssl-dev \
+        libngspice0-dev \
+        libglew-dev libglm-dev swig \
+        libcairo2-dev doxygen graphviz \
+        python3-wxgtk4.0 \
+        libwxgtk3.0-dev libwxgtk3.0-gtk3-dev python3 python3-dev \
+        && \
     apt-get clean && \
     apt-get purge && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Compile and install libngspice
-RUN git clone git://git.code.sf.net/p/ngspice/ngspice && \
-    cd ngspice && \
-    git checkout 99a20162d5038a328d335d11da69c9eee0549fdc && \
-    ./autogen.sh && \
-    ./configure --with-ngshared --enable-xspice --enable-cider --enable-openmp && \
-    make && \
-    make install && \
-    cd ..  && \
-    rm -rf ngspice /tmp/* /var/tmp/*
-
 # Download and install linuxdeploy tool
 RUN curl -O -J -L https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && \
     chmod +x linuxdeploy-x86_64.AppImage && \
@@ -38,14 +32,3 @@ RUN curl -O -J -L https://github.com/linuxdeploy/linuxdeploy/releases/download/c
     ln -s /usr/lib/linuxdeploy/plugins/linuxdeploy-plugin-conda/linuxdeploy-plugin-conda.sh /usr/lib/linuxdeploy/usr/bin/linuxdeploy-plugin-conda && \
     rm -rf *.AppImage /tmp/* /var/tmp/*
 
-# Install kicad deps
-RUN apt-get update -q && \
-    apt-get install --no-upgrade -qqy \
-        libglew-dev libglm-dev swig \
-        libcairo2-dev doxygen graphviz \
-        python3-wxgtk4.0 \
-        libwxgtk3.0-dev libwxgtk3.0-gtk3-dev python3 python3-dev \
-        curl wget && \
-    apt-get clean && \
-    apt-get purge && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*