diff --git a/Dockerfile b/Dockerfile
index 232f55f..aa06bc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:wheezy
 MAINTAINER Adrian Dvergsdal [atmoz.net]
 
-# Install SSH
+# Install OpenSSH
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install openssh-server && \
     rm -rf /var/lib/apt/lists/*
@@ -9,12 +9,10 @@ RUN apt-get update && \
 # sshd needs this directory to run
 RUN mkdir -p /var/run/sshd
 
-# Add configuration and script
-ADD . /root
-WORKDIR /root
-RUN mv sshd_config /etc/ssh/sshd_config && \
-    chmod +x run
+# Copy configuration and entrypoint script
+COPY sshd_config /etc/ssh/sshd_config
+COPY entrypoint /
 
 EXPOSE 22
 
-ENTRYPOINT ["./run"]
+ENTRYPOINT ["/entrypoint"]
diff --git a/run b/entrypoint
similarity index 100%
rename from run
rename to entrypoint