diff --git a/Dockerfile b/Dockerfile
index facb27d..ff1ed55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,10 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-COPY rootfs/ /
+# only copy files necessary for the build, copy whole rootfs later
+# this improves build caching when changing service and startup scripting
+COPY rootfs/tar1090-install.sh /
+COPY rootfs/etc/nginx.tar1090 /etc/nginx.tar1090
 
 # add telegraf binary
 ##telegraf##COPY --from=telegraf /usr/bin/telegraf /usr/bin/telegraf
@@ -178,6 +181,8 @@ RUN set -x && \
     popd && \
     rm -rf /tmp/*
 
+COPY rootfs/ /
+
 EXPOSE 80/tcp
 
 # Add healthcheck
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-sanity-check/up b/rootfs/etc/s6-overlay/s6-rc.d/01-sanity-check/up
deleted file mode 100755
index afa07d5..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/01-sanity-check/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/01-sanity-check
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/type b/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/up b/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/up
deleted file mode 100755
index 7e589c7..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/02-tar1090-update
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/type b/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/up b/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/up
deleted file mode 100755
index 43c05f4..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/04-tar1090-configure
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/type b/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/up b/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/up
deleted file mode 100755
index 1eedc7b..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/06-range-outline
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/type b/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/up b/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/up
deleted file mode 100755
index f28295b..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/07-ngnix-logging
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/down b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/down
deleted file mode 100755
index 2fe550e..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/down
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/08-graphs1090-down
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/type b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/up b/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/up
deleted file mode 100755
index 788e03a..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/08-graphs1090/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/08-graphs1090-init
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/down b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/down
deleted file mode 100755
index 44dbaa3..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/down
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/09-rtlsdr-biastee-down
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/type b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/up b/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/up
deleted file mode 100755
index 188c035..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/09-rtlsdr-biastee/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/09-rtlsdr-biastee-init
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/type b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/up b/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/up
deleted file mode 100755
index 143f47e..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/10-telegraf-conf/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/10-telegraf-conf
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/02-tar1090-update/dependencies.d/01-sanity-check
rename to rootfs/etc/s6-overlay/s6-rc.d/autogain/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/dependencies.d/01-sanity-check
rename to rootfs/etc/s6-overlay/s6-rc.d/collectd/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/04-tar1090-configure/dependencies.d/02-tar1090-update
rename to rootfs/etc/s6-overlay/s6-rc.d/graphs1090-writeback/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/dependencies.d/01-sanity-check
rename to rootfs/etc/s6-overlay/s6-rc.d/graphs1090/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/dependencies.d/02-tar1090-update
rename to rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/06-range-outline/dependencies.d/04-tar1090-configure
rename to rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-sanity-check/type b/rootfs/etc/s6-overlay/s6-rc.d/startup/type
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/01-sanity-check/type
rename to rootfs/etc/s6-overlay/s6-rc.d/startup/type
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/startup/up b/rootfs/etc/s6-overlay/s6-rc.d/startup/up
new file mode 100755
index 0000000..ad2e862
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/startup/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/01-sanity-check
rename to rootfs/etc/s6-overlay/s6-rc.d/tar1090/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/02-tar1090-update
rename to rootfs/etc/s6-overlay/s6-rc.d/telegraf/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/04-tar1090-configure
rename to rootfs/etc/s6-overlay/s6-rc.d/timelapse1090/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-sanity-check b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-sanity-check
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/02-tar1090-update b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/02-tar1090-update
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/04-tar1090-configure b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/04-tar1090-configure
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/06-range-outline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/07-ngnix-logging b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/07-ngnix-logging
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/08-graphs1090 b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/08-graphs1090
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/09-rtlsdr-biastee b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/09-rtlsdr-biastee
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/10-telegraf-conf b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/10-telegraf-conf
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/06-range-outline b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/07-ngnix-logging/dependencies.d/06-range-outline
rename to rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/startup
diff --git a/rootfs/etc/s6-overlay/scripts/readsb b/rootfs/etc/s6-overlay/scripts/readsb
index 874115e..48db63a 100755
--- a/rootfs/etc/s6-overlay/scripts/readsb
+++ b/rootfs/etc/s6-overlay/scripts/readsb
@@ -323,4 +323,4 @@ if chk_enabled "$PROMETHEUS_ENABLE"; then
 fi
 
 # shellcheck disable=SC2086
-"${s6wrap[@]}" "${READSB_BIN}" "${READSB_CMD[@]}" $READSB_EXTRA_ARGS
+exec "${s6wrap[@]}" "${READSB_BIN}" "${READSB_CMD[@]}" $READSB_EXTRA_ARGS
diff --git a/rootfs/etc/s6-overlay/scripts/startup b/rootfs/etc/s6-overlay/scripts/startup
new file mode 100755
index 0000000..c746be0
--- /dev/null
+++ b/rootfs/etc/s6-overlay/scripts/startup
@@ -0,0 +1,18 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash disable=SC1091,SC2076
+
+source /scripts/common
+
+SDIR=/etc/s6-overlay/startup.d
+
+# exit 0 for nonexistent or empty directory
+if ! [[ -d "$SDIR" ]] || [[ -z "$(ls "$SDIR")" ]]; then
+    exit 0
+fi
+
+for NAME in "$SDIR"/*; do
+    if ! s6wrap --quiet --prepend="$NAME" --timestamps --args "$NAME"; then
+        s6wrap --quiet --prepend=startup --timestamps --args echo Error running "$NAME"
+        exit 1
+    fi
+done
diff --git a/rootfs/etc/s6-overlay/scripts/01-sanity-check b/rootfs/etc/s6-overlay/startup.d/01-sanity-check
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/01-sanity-check
rename to rootfs/etc/s6-overlay/startup.d/01-sanity-check
diff --git a/rootfs/etc/s6-overlay/scripts/02-tar1090-update b/rootfs/etc/s6-overlay/startup.d/02-tar1090-update
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/02-tar1090-update
rename to rootfs/etc/s6-overlay/startup.d/02-tar1090-update
diff --git a/rootfs/etc/s6-overlay/scripts/04-tar1090-configure b/rootfs/etc/s6-overlay/startup.d/04-tar1090-configure
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/04-tar1090-configure
rename to rootfs/etc/s6-overlay/startup.d/04-tar1090-configure
diff --git a/rootfs/etc/s6-overlay/scripts/06-range-outline b/rootfs/etc/s6-overlay/startup.d/06-range-outline
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/06-range-outline
rename to rootfs/etc/s6-overlay/startup.d/06-range-outline
diff --git a/rootfs/etc/s6-overlay/scripts/07-ngnix-logging b/rootfs/etc/s6-overlay/startup.d/07-ngnix-logging
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/07-ngnix-logging
rename to rootfs/etc/s6-overlay/startup.d/07-ngnix-logging
diff --git a/rootfs/etc/s6-overlay/scripts/08-graphs1090-down b/rootfs/etc/s6-overlay/startup.d/08-graphs1090-down
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/08-graphs1090-down
rename to rootfs/etc/s6-overlay/startup.d/08-graphs1090-down
diff --git a/rootfs/etc/s6-overlay/scripts/08-graphs1090-init b/rootfs/etc/s6-overlay/startup.d/08-graphs1090-init
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/08-graphs1090-init
rename to rootfs/etc/s6-overlay/startup.d/08-graphs1090-init
diff --git a/rootfs/etc/s6-overlay/scripts/10-telegraf-conf b/rootfs/etc/s6-overlay/startup.d/10-telegraf-conf
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/10-telegraf-conf
rename to rootfs/etc/s6-overlay/startup.d/10-telegraf-conf