diff --git a/Dockerfile b/Dockerfile
index 3c10cbb..7b5b383 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,14 @@ FROM resin/raspberrypi-buildpack-deps
 # Enable systemd
 ENV INITSYSTEM on
 
-# Copy the installer
-COPY . ~/ttn-gateway
-
 # Build the gateway
 WORKDIR ~/ttn-gateway
+COPY resin-install.sh .
 RUN ./resin-install.sh
 
 # Make sure we start up within the bin directory
 WORKDIR /opt/ttn-gateway/bin
+COPY resin-run.sh .
 
 # Start it up
 CMD ["sh", "-c", "./resin-run.sh"]
diff --git a/Dockerfile~ b/Dockerfile~
index d459f50..3c10cbb 100644
--- a/Dockerfile~
+++ b/Dockerfile~
@@ -4,9 +4,7 @@ FROM resin/raspberrypi-buildpack-deps
 ENV INITSYSTEM on
 
 # Copy the installer
-run pwd
-# COPY . ~/ttn-gateway
-COPY ./resin-install.sh ~/ttn-gateway
+COPY . ~/ttn-gateway
 
 # Build the gateway
 WORKDIR ~/ttn-gateway
@@ -14,7 +12,6 @@ RUN ./resin-install.sh
 
 # Make sure we start up within the bin directory
 WORKDIR /opt/ttn-gateway/bin
-COPY ./resin-run.sh /opt/ttn-gateway/bin/resin-run.sh
 
 # Start it up
 CMD ["sh", "-c", "./resin-run.sh"]