diff --git a/imageroot/systemd/user/erp-next-backend.service b/imageroot/systemd/user/erp-next-backend.service
index 3d6c599..4cc30bd 100644
--- a/imageroot/systemd/user/erp-next-backend.service
+++ b/imageroot/systemd/user/erp-next-backend.service
@@ -6,7 +6,7 @@
 [Unit]
 Description=Podman erp-next-backend.service
 Requires=erp-next.service
-After=erp-next.service
+After=erp-next.service erp-next-mariadb.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-configurator.service b/imageroot/systemd/user/erp-next-configurator.service
index 8daa0b2..88a87da 100644
--- a/imageroot/systemd/user/erp-next-configurator.service
+++ b/imageroot/systemd/user/erp-next-configurator.service
@@ -6,7 +6,7 @@
 [Unit]
 Description=Podman erp-next-configurator.service
 Requires=erp-next.service
-After=erp-next.service erp-next-backend.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-create-site.service b/imageroot/systemd/user/erp-next-create-site.service
index 7ae9b31..d53f989 100644
--- a/imageroot/systemd/user/erp-next-create-site.service
+++ b/imageroot/systemd/user/erp-next-create-site.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Podman erp-next-create-site.service
 Requires=erp-next.service
-After=erp-next.service erp-next-configurator.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service erp-next-configurator.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-frontend.service b/imageroot/systemd/user/erp-next-frontend.service
index f232112..4c4bd71 100644
--- a/imageroot/systemd/user/erp-next-frontend.service
+++ b/imageroot/systemd/user/erp-next-frontend.service
@@ -3,7 +3,7 @@
 [Unit]
 Description=Podman erp-next-frontend.service
 Requires=erp-next.service
-After=erp-next.service erp-next-backend.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service erp-next-configurator.service erp-next-create-site.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-queue-long.service b/imageroot/systemd/user/erp-next-queue-long.service
index c10200a..4e0c12b 100644
--- a/imageroot/systemd/user/erp-next-queue-long.service
+++ b/imageroot/systemd/user/erp-next-queue-long.service
@@ -3,7 +3,7 @@
 [Unit]
 Description=Podman erp-next-queue-long.service
 Requires=erp-next.service
-After=erp-next.service erp-next-backend.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service erp-next-configurator.service erp-next-create-site.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-queue-short.service b/imageroot/systemd/user/erp-next-queue-short.service
index f302551..6ac0f52 100644
--- a/imageroot/systemd/user/erp-next-queue-short.service
+++ b/imageroot/systemd/user/erp-next-queue-short.service
@@ -3,7 +3,7 @@
 [Unit]
 Description=Podman erp-next-queue-short.service
 Requires=erp-next.service
-After=erp-next.service erp-next-backend.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service erp-next-configurator.service erp-next-create-site.service erp-next-queue-long.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-redis-queue.service b/imageroot/systemd/user/erp-next-redis-queue.service
index 61960de..012405a 100644
--- a/imageroot/systemd/user/erp-next-redis-queue.service
+++ b/imageroot/systemd/user/erp-next-redis-queue.service
@@ -4,7 +4,7 @@
 Description=Podman erp-next-redis-queue.service
 Requires=erp-next.service
 After=erp-next.service
-
+Before=erp-next.mariadb.service
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=always
diff --git a/imageroot/systemd/user/erp-next-scheduler.service b/imageroot/systemd/user/erp-next-scheduler.service
index c4acde3..62126d3 100644
--- a/imageroot/systemd/user/erp-next-scheduler.service
+++ b/imageroot/systemd/user/erp-next-scheduler.service
@@ -3,7 +3,7 @@
 [Unit]
 Description=Podman erp-next-scheduler.service
 Requires=erp-next.service
-After=erp-next.service erp-next-frontend.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service erp-next-configurator.service erp-next-create-site.service erp-next-queue-long.service erp-next-queue-short.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/imageroot/systemd/user/erp-next-websocket.service b/imageroot/systemd/user/erp-next-websocket.service
index 2682072..1ce22f6 100644
--- a/imageroot/systemd/user/erp-next-websocket.service
+++ b/imageroot/systemd/user/erp-next-websocket.service
@@ -3,7 +3,7 @@
 [Unit]
 Description=Podman websocket.service
 Requires=erp-next.service
-After=erp-next.service erp-next-frontend.service
+After=erp-next.service erp-next-mariadb.service erp-next-backend.service erp-next-configurator.service erp-next-create-site.service erp-next-queue-long.service erp-next-queue-short.service erp-next-scheduler.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n