diff --git a/roles/archweb/templates/archweb-mirrorcheck.service.j2 b/roles/archweb/templates/archweb-mirrorcheck.service.j2
index 395ba4452291ceaba9ad7c6f2bded5c4f454117e..7968f3d9883127507e927b8eb371bd139ccd3ab8 100644
--- a/roles/archweb/templates/archweb-mirrorcheck.service.j2
+++ b/roles/archweb/templates/archweb-mirrorcheck.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb mirrorcheck service
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-mirrorresolv.service.j2 b/roles/archweb/templates/archweb-mirrorresolv.service.j2
index 9fcc52a62824a87163887cd2a147d777bbc3753d..5beb7ed52829ef7914a1dd456993cebf218c5e9e 100644
--- a/roles/archweb/templates/archweb-mirrorresolv.service.j2
+++ b/roles/archweb/templates/archweb-mirrorresolv.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb mirrorresolv service
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-planet.service.j2 b/roles/archweb/templates/archweb-planet.service.j2
index a80b6d60573bcddab104e20802c14c26497f4ad0..8fb1db5fb012c1a3bd2356a686ade67cd6f4b375 100644
--- a/roles/archweb/templates/archweb-planet.service.j2
+++ b/roles/archweb/templates/archweb-planet.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb update planet service
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-populate_signoffs.service.j2 b/roles/archweb/templates/archweb-populate_signoffs.service.j2
index b83e1253b970a0e0a960bfc89d4de4e2653697ce..5139b75a5717e56260ff30ea7cb68fc271b09a5c 100644
--- a/roles/archweb/templates/archweb-populate_signoffs.service.j2
+++ b/roles/archweb/templates/archweb-populate_signoffs.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb populate_signoffs service
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-readlinks.service.j2 b/roles/archweb/templates/archweb-readlinks.service.j2
index dfdb62e3483d3fa5f1d6db30bfda36310c57c570..46bede9bc9065c91534cc8be7ed1ad06247435e3 100644
--- a/roles/archweb/templates/archweb-readlinks.service.j2
+++ b/roles/archweb/templates/archweb-readlinks.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb read links databases (for sonames)
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-rebuilderd.service.j2 b/roles/archweb/templates/archweb-rebuilderd.service.j2
index 24e0d3f6d3d054ef1567daded92c7d971f184387..71cf408a48a2eba72757656d4b3d55179d4cd900 100644
--- a/roles/archweb/templates/archweb-rebuilderd.service.j2
+++ b/roles/archweb/templates/archweb-rebuilderd.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb update rebuilderd status service
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-reporead.service.j2 b/roles/archweb/templates/archweb-reporead.service.j2
index c86d19d591e90a3f3f2e17dc5533ed258685fa20..b2dfa273c7d87b275239d3d6925bbcc7147b752a 100644
--- a/roles/archweb/templates/archweb-reporead.service.j2
+++ b/roles/archweb/templates/archweb-reporead.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb reporead
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/archweb/templates/archweb-rsync_iso.service.j2 b/roles/archweb/templates/archweb-rsync_iso.service.j2
index 30f8625d61eaaa528be31ae15f3147a4800050f4..eefba2a21a5a0b2745ecc33a87e855a24a61fd9e 100644
--- a/roles/archweb/templates/archweb-rsync_iso.service.j2
+++ b/roles/archweb/templates/archweb-rsync_iso.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=archweb rsync iso service
+Wants=network-online.target
 After=network-online.target
 
 [Service]
diff --git a/roles/prometheus_exporters/templates/prometheus-hetzner-textcollector.service.j2 b/roles/prometheus_exporters/templates/prometheus-hetzner-textcollector.service.j2
index 28c1252ee92ef23610242002941cc6bbf2b795eb..42e9fdf4ce8a4aa9f5bc40ac9722ac90d7abb3ab 100644
--- a/roles/prometheus_exporters/templates/prometheus-hetzner-textcollector.service.j2
+++ b/roles/prometheus_exporters/templates/prometheus-hetzner-textcollector.service.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=Prometheus Hetzner Exporter TextCollector
+Wants=network-online.target
 After=network-online.target
 
 [Service]