diff --git a/prog/weave-npc/Dockerfile.template b/prog/weave-npc/Dockerfile.template
index 2499f2a9..175fbe09 100644
--- a/prog/weave-npc/Dockerfile.template
+++ b/prog/weave-npc/Dockerfile.template
@@ -27,7 +27,8 @@ RUN apk add --update \
   && mknod /var/log/ulogd.pcap p
 COPY ./weave-npc /usr/bin/weave-npc
 COPY ./ulogd.conf /etc/ulogd.conf
-ENTRYPOINT ["/usr/bin/weave-npc"]
+COPY ./launch.sh /home/weave/
+ENTRYPOINT ["/home/weave/launch.sh"]
 
 # These labels will change for every build, and should therefore be the last layer of the image:
 ARG revision
diff --git a/prog/weave-npc/launch.sh b/prog/weave-npc/launch.sh
new file mode 100755
index 00000000..65930d66
--- /dev/null
+++ b/prog/weave-npc/launch.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Start weave-npc with any flags specified in $EXTRA_ARGS as well as any flags passed to this container (for backwards compatibility)
+exec /usr/bin/weave-npc $EXTRA_ARGS $@
\ No newline at end of file