diff --git a/Dockerfile b/Dockerfile
index fe208b0..e086f63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ ENV INITSYSTEM on
 ENV TTN_GATEWAY_SOFTWARE 48
 
 # Build the gateway
-COPY build.sh /tmp/build.sh
-WORKDIR /tmp
+COPY build.sh /opt/ttn-gateway/dev/build.sh
+WORKDIR /opt/ttn-gateway/dev
 RUN ./build.sh
 
 # Copy the run shell script after build, so we can modify it without rebuilding
diff --git a/build.sh b/build.sh
index efacc72..fe51781 100755
--- a/build.sh
+++ b/build.sh
@@ -46,12 +46,8 @@ popd
 # Restore location back to where we were prior to starting the build
 popd
 
-# Copy packet forwarder to where it'll be expected
+# Copy things needed at runtime to where they'll be expected
 cp $BUILD_DIR/packet_forwarder/poly_pkt_fwd/reset_pkt_fwd.sh $INSTALL_DIR/reset_pkt_fwd.sh
 cp $BUILD_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd $INSTALL_DIR/poly_pkt_fwd
 
-# Delete the build folder if we need space, 
-# else leave it around for on-device debugging/building
-# rm -rf $BUILD_DIR
-
 echo "Build & Installation Completed."