diff --git a/Makefile b/Makefile
index 680eac74..8356f21a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,7 @@
 
 OWNER:=jupyter
 # need to list these manually because there's a dependency tree
-ALL_STACKS:=minimal-kernel \
-	base-notebook \
+ALL_STACKS:=base-notebook \
 	minimal-notebook \
 	r-notebook \
 	scipy-notebook \
diff --git a/README.md b/README.md
index 31423055..a35246f8 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ If this is your first time using Docker or any of the Jupyter projects, do the f
 
 Here's a diagram of the `FROM` relationships between all of the images defined in this project:
 
-[![Image inheritance diagram](internal/inherit-diagram.png)](http://interactive.blockdiag.com/?compression=deflate&src=eJyFzDEPwiAQhuG9v4J0lt3Y1NjN3dEYc5SrOaEcARyq8b9bTDrQpev7PXfKcm80wUN8KiE4ELoEidiJVngOKQClZl40DvCy6T6wS5HeOM_73DtxtaDQtrVGReAOT4yR8HQ5d_Wtqf5CHoWCiNJxQsVsdmIkRyNYaTA4tPlPAfLFQpaW0bplF3vyU6HKko2GBHNF1-Pmv7Ap_BQ9BFO4dcsOrJVr-f0B5CZ-hg)
+[![Image inheritance diagram](internal/inherit-diagram.png)](http://interactive.blockdiag.com/?compression=deflate&src=eJyFzLEOwjAMRdGdr7C6d0dURXRjZ0QIOY2LTNM4SsxQEP9Ow5YuXe87tnHSj5bxAZ8dgEQmr6gsHloIEjUia7MslgZ8Ob0P4jXxm5Z5n3sHV4eGXFtZMoz-8KSUmE6Xc1fdmt1f1EcwmKj2omRExnxXhCwm9jyhK9C6ZZd6DnOhypKNRcWlku9p81_cFGFOAeNYuHXLDp2r1_L7A-hzeKU)
 
 ## Stacks, Tags, Versioning, and Progress
 
@@ -67,7 +67,7 @@ When `make release-all` successfully pushes the last of its images to Docker Hub
 
 **When there's a security fix in the Debian base image, do the following in place of the last command:**
 
-Update the `debian:jessie` SHA in the most-base images (e.g., minimal-notebook, minimal-kernel). Submit it as a regular PR and go through the build process.
+Update the `debian:jessie` SHA in the most-base images (e.g., base-notebook). Submit it as a regular PR and go through the build process.
 
 This will take time as the entire set of stacks will rebuild.
 
diff --git a/internal/inherit-diagram.png b/internal/inherit-diagram.png
index cb419991..6ca9b601 100644
Binary files a/internal/inherit-diagram.png and b/internal/inherit-diagram.png differ
diff --git a/minimal-kernel/.dockerignore b/minimal-kernel/.dockerignore
deleted file mode 100644
index 9dea340f..00000000
--- a/minimal-kernel/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Documentation
-README.md
diff --git a/minimal-kernel/Dockerfile b/minimal-kernel/Dockerfile
deleted file mode 100644
index 4d67cae6..00000000
--- a/minimal-kernel/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) Jupyter Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-# Debian Jessie image released 2016 March 01.
-FROM debian@sha256:a9c958be96d7d40df920e7041608f2f017af81800ca5ad23e327bc402626b58e
-
-MAINTAINER Jupyter Project <jupyter@googlegroups.com>
-
-USER root
-
-# Install all OS dependencies for fully functional notebook server
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -yq --no-install-recommends \
-    python3-setuptools \
-    python3-zmq \
-    && apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install Tini
-RUN python3 -c 'from urllib.request import urlretrieve; \
-urlretrieve("https://github.com/krallin/tini/releases/download/v0.6.0/tini", "tini")' && \
-    echo "d5ed732199c36a1189320e6c4859f0169e950692f451c03e7854243b95f4234b *tini" | sha256sum -c - && \
-    mv tini /usr/local/bin/tini && \
-    chmod +x /usr/local/bin/tini
-
-# Configure environment
-ENV KG_USER jovyan
-ENV KG_UID 1000
-
-# Create jovyan user with UID=1000
-RUN useradd -m -s /bin/bash -N -u $KG_UID $KG_USER
-
-# Install modern pip then kernel gateway
-RUN apt-get update && \
-    apt-get install -yq --no-install-recommends \
-        build-essential \
-        python3-dev && \
-    easy_install3 pip && \
-    pip install jupyter_kernel_gateway==0.3.1 && \
-    apt-get remove --purge -y \
-        build-essential \
-        python3-dev && \
-    apt-get autoremove -y && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Configure container startup
-EXPOSE 8888
-WORKDIR /tmp
-ENTRYPOINT ["tini", "--"]
-CMD ["jupyter", "kernelgateway", "--KernelGatewayApp.ip=0.0.0.0"]
-
-# Run container as jovyan
-USER jovyan
diff --git a/minimal-kernel/README.md b/minimal-kernel/README.md
deleted file mode 100644
index 809b0171..00000000
--- a/minimal-kernel/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-![docker pulls](https://img.shields.io/docker/pulls/jupyter/minimal-kernel.svg) ![docker stars](https://img.shields.io/docker/stars/jupyter/minimal-kernel.svg)
-
-# Kernel Gateway Stack
-
-## What it Gives You
-
-* [Jupyter Kernel Gateway](https://github.com/jupyter-incubator/kernel_gateway) that enables programmatic access to kernels
-* Python 3 kernel
-* No preinstalled scientific computing packages
-* [tini](https://github.com/krallin/tini) as the container entrypoint
-
-## Basic Use
-
-The following command starts a container with the Kernel Gateway server listening for HTTP connections on port 8888.
-
-```
-docker run -d -p 8888:8888 jupyter/minimal-kernel
-```
-
-## Docker Options and More Information
-* For more information on the Kernel Gateway and its configuration options see the
-[Kernel Gateway Repository](https://github.com/jupyter-incubator/kernel_gateway#what-it-gives-you).