diff --git a/images/chromium-headful/Dockerfile b/images/chromium-headful/Dockerfile
index 96901308..dfc70c09 100644
--- a/images/chromium-headful/Dockerfile
+++ b/images/chromium-headful/Dockerfile
@@ -177,7 +177,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=$CACHEIDPREFIX-ap
     apt-get update && \
     apt-get -y upgrade && \
     apt-get --no-install-recommends -y install  \
-    gpg-agent \
+    gpg \
     # UI Requirements
     xvfb \
     xterm \
@@ -186,30 +186,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=$CACHEIDPREFIX-ap
     imagemagick \
     sudo \
     mutter \
-    # Python/pyenv reqs
-    build-essential \
-    libssl-dev  \
-    zlib1g-dev \
-    libbz2-dev \
-    libreadline-dev \
-    libsqlite3-dev \
     curl \
-    git \
-    libncursesw5-dev \
-    xz-utils \
-    tk-dev \
-    libxml2-dev \
-    libxmlsec1-dev \
-    libffi-dev \
-    liblzma-dev \
     # Network tools
     net-tools \
     netcat \
-    # PPA req
-    software-properties-common && \
     # Userland apps
-    sudo add-apt-repository ppa:mozillateam/ppa && \
-    sudo apt-get --no-install-recommends -y install \
     x11-apps \
     tint2 \
     wget \
@@ -263,7 +244,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=$CACHEIDPREFIX-ap
     set -eux; \
     apt-get update; \
     apt-get --no-install-recommends -y install \
-    wget ca-certificates python2 supervisor xclip xdotool unclutter \
+    wget ca-certificates supervisor xclip xdotool unclutter \
     pulseaudio dbus-x11 xserver-xorg-video-dummy \
     libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 \
     x11-xserver-utils \
diff --git a/images/chromium-headless/image/Dockerfile b/images/chromium-headless/image/Dockerfile
index a27861b6..12a1fa18 100644
--- a/images/chromium-headless/image/Dockerfile
+++ b/images/chromium-headless/image/Dockerfile
@@ -143,10 +143,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=$CACHEIDPREFIX-ap
     apt-get -yqq --no-install-recommends install \
     ca-certificates \
     curl \
-    build-essential \
-    libssl-dev \
-    git \
-    gpg-agent \
+    gpg \
     dbus \
     dbus-x11 \
     pulseaudio \
@@ -159,7 +156,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=$CACHEIDPREFIX-ap
     fonts-noto-cjk \
     fonts-noto-color-emoji \
     fonts-nanum \
-    software-properties-common \
     supervisor; \
     fc-cache -f