diff --git a/Dockerfile b/Dockerfile
index 56c34ff..0b2118e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,9 +8,8 @@ COPY resin-install.sh /ttn-gateway/resin-install.sh
 WORKDIR /ttn-gateway
 RUN ./resin-install.sh
 
-# Make sure we start up within the bin directory
+# Copy the run shell script after build, so we can modify it without rebuilding
 COPY resin-run.sh /opt/ttn-gateway/bin/resin-run.sh
-WORKDIR /opt/ttn-gateway/bin
 
 # Start it up
-CMD ["sh", "-c", "./resin-run.sh"]
+CMD ["sh", "-c", "/opt/ttn-gateway/bin/resin-run.sh"]
diff --git a/Dockerfile~ b/Dockerfile~
index b8466c5..56c34ff 100644
--- a/Dockerfile~
+++ b/Dockerfile~
@@ -4,12 +4,12 @@ FROM resin/raspberrypi-buildpack-deps
 ENV INITSYSTEM on
 
 # Build the gateway
-COPY resin-install.sh /ttn-gateway
+COPY resin-install.sh /ttn-gateway/resin-install.sh
 WORKDIR /ttn-gateway
 RUN ./resin-install.sh
 
 # Make sure we start up within the bin directory
-COPY resin-run.sh /opt/ttn-gateway/bin
+COPY resin-run.sh /opt/ttn-gateway/bin/resin-run.sh
 WORKDIR /opt/ttn-gateway/bin
 
 # Start it up