diff --git a/Dockerfile_base b/Dockerfile_base
index 66e3f2e..abc8a80 100644
--- a/Dockerfile_base
+++ b/Dockerfile_base
@@ -3,19 +3,7 @@
 # Not using python:3.7 here because team-gcc-arm-embedded/ppa does not support
 # Ubuntu Cosmic or Debian Stretch, and Alpine, bizarrely, does not seem to
 # package GCC cross compilers
-FROM ubuntu:bionic
+FROM python:3.7-alpine
 
-# Set up PPAs we'll need for Python and for GCC ARM
-RUN apt-get update && apt-get install -y software-properties-common
-RUN add-apt-repository ppa:deadsnakes/ppa
-RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa
-
-# Install Python
-RUN apt-get update && apt-get install -y python3.7 python3.7-dev build-essential pkg-config libffi-dev curl
-RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
-# Downgrade pip to work around https://github.com/pypa/pipenv/issues/2924
-RUN python3.7 -m pip install pip==18.0
-RUN python3.7 -m pip install pipenv==2018.7.1
-
-# Install KMK CI and/or build-time dependencies
-RUN apt-get install -y gcc-arm-embedded gettext ssh wget unzip rsync git locales libusb-dev
+RUN apk update && apk add alpine-sdk curl wget ssh rsync git git-lfs
+RUN pip install pipenv
diff --git a/Makefile b/Makefile
index ddc34ed..557119c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ DOCKER_TAG ?= latest
 AMPY_PORT ?= /dev/ttyUSB0
 AMPY_BAUD ?= 115200
 AMPY_DELAY ?= 1.5
-ARDUINO ?= /usr/share/arduino
 PIPENV ?= $(shell which pipenv)
 
 all: copy-kmk copy-bootpy copy-keymap
@@ -49,6 +48,10 @@ clean-build-log:
 	@echo "===> Clearing previous .build.log"
 	@rm -rf .build.log
 
+# This is mostly a leftover from the days we vendored stuff from
+# micropython-lib via submodules. Leaving this here mostly in case someone goes
+# exploring through the history of KMK's repo and manages to screw up their
+# repo state (those were glitchy times...)
 powerwash: clean
 	@echo "===> Removing vendor/ to force a re-pull"
 	@rm -rf vendor