diff --git a/Dockerfile b/Dockerfile
index 07ed70e8..52b74d9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,3 @@
 FROM resin/rpi-buildstep:v0.0.7
 ADD . /app
-ADD deploy_key /root/.ssh/id_rsa
-RUN chmod 400 /root/.ssh/id_rsa
-ADD known_hosts /root/.ssh/known_hosts
 RUN /build/builder
-ENTRYPOINT ["/app/entry.sh"]
diff --git a/deps.sh b/deps.sh
index e1a3ba72..435e2d3e 100644
--- a/deps.sh
+++ b/deps.sh
@@ -1,2 +1,9 @@
+# Deploy key for private npm modules
+mkdir -p /root/.ssh
+cp deploy_key /root/.ssh/id_rsa
+chmod 400 /root/.ssh/id_rsa
+cp known_hosts /root/.ssh/known_hosts
+
+# System dependencies
 apt-get update
 apt-get install -y openvpn libsqlite3-dev python
diff --git a/package.json b/package.json
index 76267781..1403cec6 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "preinstall": "bash deps.sh",
     "postinstall": "node ./node_modules/coffee-script/bin/coffee -c ./src",
-    "start": "node src/supervisor.js"
+    "start": "bash entry.sh node src/supervisor.js"
   },
   "dependencies": {
     "coffee-script": "~1.7.1",