diff --git a/Makefile b/Makefile
index 876b9280..989b6674 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ prepare-virtual:
 	$(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual
 
 
-simulator-tests: install-arduino-cli configure-arduino-cli install-arduino-core-avr prepare-virtual
+simulator-tests: configure-arduino-cli prepare-virtual
 	$(MAKE) -C tests all
 
 docker-simulator-tests:
diff --git a/etc/Dockerfile b/etc/Dockerfile
index 2f587e4a..718125be 100644
--- a/etc/Dockerfile
+++ b/etc/Dockerfile
@@ -8,15 +8,9 @@ RUN apt-get -qq update && \
 RUN ccache --set-config=cache_dir=/kaleidoscope-persist/ccache/cache
 
 
-ENV ARDUINO_VERSION "1.8.13"
-
-WORKDIR /usr/local
-RUN curl https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz | \
-  xzcat | tar xf - && \
-  ln -s arduino-${ARDUINO_VERSION} arduino
 RUN curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | \
   sh
-RUN /usr/local/bin/arduino-cli core install arduino:avr
+RUN /bin/arduino-cli core install arduino:avr
 
 
 COPY docker-entrypoint.sh /usr/local/bin/entrypoint