diff --git a/debian/systemd/koha-create-dirs@.service b/debian/systemd/koha-create-dirs@.service
index b6eaac6341..2a299111c5 100644
--- a/debian/systemd/koha-create-dirs@.service
+++ b/debian/systemd/koha-create-dirs@.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Create directories for Koha instance %i
 PartOf=koha@%i.target
-Before=koha-plack@%i.service koha-zebra@%i.service koha-indexer@%i.service koha-es-indexer@%i.service koha-worker@%i.service koha-worker-long_tasks@%i.service koha-sip@%i.service koha-z3950@%i.service
 
 [Service]
 Type=oneshot
diff --git a/debian/systemd/koha-es-indexer@.service b/debian/systemd/koha-es-indexer@.service
index d4e02c3540..67e3cf1cac 100644
--- a/debian/systemd/koha-es-indexer@.service
+++ b/debian/systemd/koha-es-indexer@.service
@@ -2,7 +2,7 @@
 Description=Koha Elasticsearch indexer daemon for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3
 
diff --git a/debian/systemd/koha-indexer@.service b/debian/systemd/koha-indexer@.service
index 34c929f537..78c8b53f8c 100644
--- a/debian/systemd/koha-indexer@.service
+++ b/debian/systemd/koha-indexer@.service
@@ -2,7 +2,7 @@
 Description=Koha Zebra indexer daemon for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target koha-zebra@%i.service
+After=koha@%i.target koha-zebra@%i.service koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3
 
diff --git a/debian/systemd/koha-plack@.service b/debian/systemd/koha-plack@.service
index ae24bdc502..d0c82056e1 100644
--- a/debian/systemd/koha-plack@.service
+++ b/debian/systemd/koha-plack@.service
@@ -2,7 +2,7 @@
 Description=Koha Plack server for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3
 
diff --git a/debian/systemd/koha-sip@.service b/debian/systemd/koha-sip@.service
index 29454db794..b91a524ae0 100644
--- a/debian/systemd/koha-sip@.service
+++ b/debian/systemd/koha-sip@.service
@@ -2,7 +2,7 @@
 Description=Koha SIP server for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 AssertPathExists=/etc/koha/sites/%i/SIPconfig.xml
 
 StartLimitIntervalSec=60
diff --git a/debian/systemd/koha-worker-long_tasks@.service b/debian/systemd/koha-worker-long_tasks@.service
index 95631f8f53..0593229c90 100644
--- a/debian/systemd/koha-worker-long_tasks@.service
+++ b/debian/systemd/koha-worker-long_tasks@.service
@@ -2,7 +2,7 @@
 Description=Koha background worker (long_tasks queue) for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3
 
diff --git a/debian/systemd/koha-worker@.service b/debian/systemd/koha-worker@.service
index ef065b7492..8534d633e1 100644
--- a/debian/systemd/koha-worker@.service
+++ b/debian/systemd/koha-worker@.service
@@ -2,7 +2,7 @@
 Description=Koha background worker (default queue) for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3
 
diff --git a/debian/systemd/koha-z3950@.service b/debian/systemd/koha-z3950@.service
index 5f920d792d..482c1dfbfc 100644
--- a/debian/systemd/koha-z3950@.service
+++ b/debian/systemd/koha-z3950@.service
@@ -2,7 +2,7 @@
 Description=Koha Z39.50/SRU server for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3
 
diff --git a/debian/systemd/koha-zebra@.service b/debian/systemd/koha-zebra@.service
index de22579af6..0d6bf55b91 100644
--- a/debian/systemd/koha-zebra@.service
+++ b/debian/systemd/koha-zebra@.service
@@ -2,7 +2,7 @@
 Description=Koha Zebra indexing server for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
-After=koha@%i.target
+After=koha@%i.target koha-create-dirs@%i.service
 StartLimitIntervalSec=60
 StartLimitBurst=3