diff --git a/docker/bake.Dockerfile b/docker/bake.Dockerfile
index b511d8a..4180037 100644
--- a/docker/bake.Dockerfile
+++ b/docker/bake.Dockerfile
@@ -1,12 +1,13 @@
 FROM kennethreitz/bake:core
 
-ARG DEBIAN_FRONTEND='noninteractive'
-
 ENV BAKEFILE_PATH /app/Bakefile
 
 # -- Install latest Bake.
 RUN set -ex && \
-    pip3 install bake-cli --upgrade --quiet > /dev/null && \
+    pip3 install bake-cli --upgrade --quiet > /dev/null
+
+# -- Really slim down that image.
+RUN set -ex && \
     rm -fr /var/lib/apt/lists
 
 # -- Copy Bakefile of depending Dockerfiles.
diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile
index 41020d2..0175f04 100644
--- a/docker/ci.Dockerfile
+++ b/docker/ci.Dockerfile
@@ -2,9 +2,6 @@ FROM kennethreitz/bake:core
 
 ENV TERM xterm
 
-# -- Install CircleCI CLI.
-RUN curl -fLSs https://circle.ci/cli --retry 3 | bash
-
 # -- Install CI deps.
 RUN set -ex && \
     apt-get update -qq && \
@@ -17,6 +14,20 @@ RUN set -ex && \
     npm install -g bats > /dev/null && \
     pip3 install bake-cli --upgrade --quiet > /dev/null && \
     apt remove --autoremove --purge -y curl && \
+    apt-get install expect npm -y -qq >/dev/null && \
+    apt-get clean -y -qq && \
+    apt-get autoclean -y -qq && \
     rm -fr /var/lib/apt/lists/*
 
+# -- Install bats.
+RUN set -ex && npm install -g bats > /dev/null
+
+# -- Install latest Bake.
+RUN set -ex && \
+    pip3 install bake-cli --upgrade --quiet > /dev/null
+
+# -- Really slim down that image.
+RUN set -ex && \
+    rm -fr /var/lib/apt/lists
+
 ENTRYPOINT [ "bash" ]
diff --git a/docker/core.Dockerfile b/docker/core.Dockerfile
index 4191d78..dcbec24 100644
--- a/docker/core.Dockerfile
+++ b/docker/core.Dockerfile
@@ -1,10 +1,27 @@
-FROM python:3-slim
+FROM ubuntu:19.04
 
 # Tell Ubuntu to not prompt during apt installs.
-ARG DEBIAN_FRONTEND='noninteractive'
+ENV DEBIAN_FRONTEND 'noninteractive'
 
 # -- System dependencies + common utilities.
-RUN pip3 install pipenv --quiet --no-cache 2>/dev/null
+RUN set -ex && \
+    apt-get update -qq && \
+    apt-get upgrade -y -qq && \
+    apt-get install curl python3 git python3-distutils  -y -qq >/dev/null && \
+    apt-get clean -y -qq && \
+    apt-get autoclean -y -qq
+
+# -- Install pip.
+RUN set -ex && curl -s --retry 3 https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py && \
+    python3 /tmp/get-pip.py > /dev/null && rm -fr /tmp/get-pip.py
+
+# -- Install hconfig.
+RUN set -ex && \
+    pip3 install pipenv --quiet --no-cache 2>/dev/null
+
+# -- Clean up.
+RUN set -ex && \
+    apt-get clean -y -qq && apt-get autoremove -y -qq && apt-get autoclean -y -qq
 
 # -- Home directory.
 RUN set -ex && \
diff --git a/docker/red.Dockerfile b/docker/red.Dockerfile
index f3ee820..7368f7c 100644
--- a/docker/red.Dockerfile
+++ b/docker/red.Dockerfile
@@ -2,7 +2,10 @@ FROM kennethreitz/bake:core
 
 # -- Install latest Bake.
 RUN set -ex && \
-    pip3 install bake-cli --upgrade --quiet > /dev/null && \
+    pip3 install bake-cli --upgrade --quiet > /dev/null
+
+# -- Really slim down that image.
+RUN set -ex && \
     rm -fr /var/lib/apt/lists
 
 ENTRYPOINT [ "red" ]