diff --git a/dockerfile-nogit b/dockerfile-nogit
index 0f560b9328d496e23e997d2509119c6e60796492..a79fd155328b0d5e50c8164e95d8f84d69e47ddf 100644
--- a/dockerfile-nogit
+++ b/dockerfile-nogit
@@ -1,27 +1,31 @@
-FROM ubuntu:latest
-
-# Set location to download ARM toolkit from.
-# This will need to be changed over time or replaced with a static link to the latest release.
-ENV ARMBINURL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D \
-    PATH=$PATH:/opt/build/armbin/bin
-
-#Create volume /havoc/bin for compiled firmware binaries
-VOLUME /havoc
-WORKDIR /havoc/firmware
-
-# Fetch dependencies from APT
-RUN apt-get update && \
-	apt-get install -y git tar wget dfu-util cmake python3 python-pip && \
-	apt-get -qy autoremove
-
-RUN pip install pyyaml
-
-# Grab the GNU ARM toolchain from arm.com
-# Then extract contents to /opt/build/armbin/
-RUN mkdir /opt/build && cd /opt/build && \
-	wget -O gcc-arm-none-eabi $ARMBINURL && \
-	mkdir armbin && \
-	tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
-
-CMD cd .. && cd build && \
+FROM ubuntu:latest
+
+# Set location to download ARM toolkit from.
+# This will need to be changed over time or replaced with a static link to the latest release.
+ENV ARMBINURL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D \
+	PATH=$HOME/bin:$PATH:/opt/build/armbin/bin
+
+#Create volume /havoc/bin for compiled firmware binaries
+VOLUME /havoc
+WORKDIR /havoc/firmware
+
+# Fetch dependencies from APT
+RUN apt-get update && \
+	apt-get install -y git tar wget dfu-util cmake python3 python-pip ccache && \
+	apt-get -qy autoremove
+
+RUN pip install pyyaml
+
+# Grab the GNU ARM toolchain from arm.com
+# Then extract contents to /opt/build/armbin/
+RUN mkdir /opt/build && cd /opt/build && \
+	wget -O gcc-arm-none-eabi $ARMBINURL && \
+	mkdir armbin && \
+	tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
+
+# Configure CCACHE
+RUN mkdir ~/bin && cd ~/bin && \
+	for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
+
+CMD cd .. && cd build && \
     cmake .. && make firmware
\ No newline at end of file