diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/type b/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/up b/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/up
deleted file mode 100755
index 984224c..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/01-print-container-version
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/type b/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/up b/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/up
deleted file mode 100755
index 2f8e03c..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/50-store-uuid
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/type b/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/type
deleted file mode 100644
index bdd22a1..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/up b/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/up
deleted file mode 100755
index fe58c47..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/up
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/s6-overlay/scripts/60-mlathub-prep
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/60-mlathub-prep
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/dependencies.d/01-print-container-version
rename to rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/01-print-container-version
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/50-store-uuid
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/60-mlathub-prep
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/dependencies.d/01-print-container-version
rename to rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/01-print-container-version
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/50-store-uuid
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/60-mlathub-prep
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/dependencies.d/50-store-uuid
rename to rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/01-print-container-version
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/50-store-uuid
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/60-mlathub-prep
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/01-print-container-version
rename to rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/01-print-container-version
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/50-store-uuid
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/60-mlathub-prep
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/startup
similarity index 100%
rename from rootfs/etc/s6-overlay/s6-rc.d/adsbx-stats/dependencies.d/50-store-uuid
rename to rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-print-container-version
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-store-uuid
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/60-mlathub-prep
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/scripts/01-print-container-version b/rootfs/etc/s6-overlay/startup.d/01-print-container-version
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/01-print-container-version
rename to rootfs/etc/s6-overlay/startup.d/01-print-container-version
diff --git a/rootfs/etc/s6-overlay/scripts/50-store-uuid b/rootfs/etc/s6-overlay/startup.d/50-store-uuid
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/50-store-uuid
rename to rootfs/etc/s6-overlay/startup.d/50-store-uuid
diff --git a/rootfs/etc/s6-overlay/scripts/60-mlathub-prep b/rootfs/etc/s6-overlay/startup.d/60-mlathub-prep
similarity index 100%
rename from rootfs/etc/s6-overlay/scripts/60-mlathub-prep
rename to rootfs/etc/s6-overlay/startup.d/60-mlathub-prep