diff --git a/doctor/Dockerfile b/doctor/Dockerfile
index eb4fee5..d1cadef 100644
--- a/doctor/Dockerfile
+++ b/doctor/Dockerfile
@@ -12,18 +12,17 @@
 #	# Build doctor image
 #	docker build -t doctor .
 #
-#	docker run -it doctor
+#	docker run -it jess/doctor
 #
 
 # Base docker image
-FROM debian:jessie
+FROM alpine:latest
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-# Install emacs
-RUN apt-get update && apt-get install -y \
-	emacs \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+# Install emacs:
+# Note: Eamcs is only in testing repo -> http://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64
+
+RUN apk update && apk add emacs --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
 
 # Autorun doctor
 CMD ["/usr/bin/emacs", "-f", "doctor"]
diff --git a/telnet/Dockerfile b/telnet/Dockerfile
index bd05ed8..dec3733 100644
--- a/telnet/Dockerfile
+++ b/telnet/Dockerfile
@@ -1,9 +1,9 @@
-FROM debian:jessie
+# command to run Telnet
+# docker run -it --rm \
+#	--log-driver none \
+#	jess/telnet "$@"
+#
+FROM alpine:latest
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-RUN apt-get update && apt-get install -y \
-	telnet \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
 ENTRYPOINT [ "telnet" ]