diff --git a/.dockerignore b/.dockerignore
index 7ed3a6bd452..bbb4365896c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,6 +9,7 @@ images
 log
 plans
 support
+!support/init.sh
 vendor
 web
 *.md
diff --git a/Dockerfile b/Dockerfile
index 1e575dd627a..60752935ae8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,9 +40,14 @@ RUN cargo install protobuf
 COPY .delivery/scripts/ssh_wrapper.sh /usr/local/bin
 COPY .delivery/scripts/git_src_checkout.sh /usr/local/bin
 COPY components/studio/install.sh /tmp
+COPY support/init.sh /init.sh
 RUN /tmp/install.sh \
   && hab-bpm install core/busybox-static \
+  && (cd /tmp && curl -sLO https://s3-us-west-2.amazonaws.com/fnichol-lfs-tools/core-20160423193745.pub) \
+  && chmod 755 /init.sh \
   && rm -f /tmp/install.sh /hab/cache/artifacts/*
 
 WORKDIR /src
+# This entrypoint is temporary until origin key download on install is implemented
+ENTRYPOINT ["/init.sh"]
 CMD ["bash"]
diff --git a/support/init.sh b/support/init.sh
new file mode 100644
index 00000000000..1de807a68f2
--- /dev/null
+++ b/support/init.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ ! -f /hab/cache/keys/core-20160423193745.pub ]; then
+  cp -v /tmp/core-20160423193745.pub /hab/cache/keys
+fi
+
+exec "$@"