diff --git a/atom/Dockerfile b/atom/Dockerfile
index 143a517..e74a0d9 100644
--- a/atom/Dockerfile
+++ b/atom/Dockerfile
@@ -19,11 +19,27 @@
 #
 
 # Base docker image
-FROM debian:sid
+FROM debian:stretch-slim
+
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
+# Tell debconf to run in non-interactive mode
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get install -y \
+	apt-transport-https \
+	ca-certificates \
+	curl \
+	gnupg \
+	--no-install-recommends
+
+# Add the atom debian repo
+RUN curl -sSL https://packagecloud.io/AtomEditor/atom/gpgkey | apt-key add -
+RUN sh -c 'echo "deb [arch=amd64] https://packagecloud.io/AtomEditor/atom/any/ any main" > /etc/apt/sources.list.d/atom.list'
+
 # Install dependencies
 RUN apt-get update && apt-get install -y \
+	atom \
 	git \
 	gconf2 \
 	gconf-service \
@@ -43,20 +59,5 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV ATOM_VERSION 1.27.1
-
-# download the source
-RUN buildDeps=' \
-		ca-certificates \
-		curl \
-	' \
-	&& set -x \
-	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL https://github.com/atom/atom/releases/download/v${ATOM_VERSION}/atom-amd64.deb -o /tmp/atom-amd64.deb \
-	&& dpkg -i /tmp/atom-amd64.deb \
-	&& rm -rf /tmp/*.deb \
-	&& apt-get purge -y --auto-remove $buildDeps
-
 # Autorun atom
 ENTRYPOINT [ "atom", "--foreground" ]