diff --git a/dist.linux/share/cellframe-diagtool.service b/dist.linux/share/cellframe-diagtool.service
index f88e370fc1f98e97e834aca9a855a1c2fba292ea..fb209b0ebac5ea52ccf2d4a62e7e0faa34964649 100644
--- a/dist.linux/share/cellframe-diagtool.service
+++ b/dist.linux/share/cellframe-diagtool.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe DiagTool
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node/
diff --git a/dist.linux/share/cellframe-node.asan.service b/dist.linux/share/cellframe-node.asan.service
index fb101ddd5f17e726a3278fb853b13eefbac17976..2e5c90cbcac4ae955881fabf6326a96b5b094daa 100644
--- a/dist.linux/share/cellframe-node.asan.service
+++ b/dist.linux/share/cellframe-node.asan.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-node.service b/dist.linux/share/cellframe-node.service
index 269645dbed7c3bd01325eca6759e1497a52e5d3a..0a3d8c177eb95172ecc9a5ad5e21f380e22f4b29 100644
--- a/dist.linux/share/cellframe-node.service
+++ b/dist.linux/share/cellframe-node.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-node.tsan.service b/dist.linux/share/cellframe-node.tsan.service
index 904a41dad13d32c27dad3c45538ba04a8d76ac1a..09c2a89c1ce01df1edb15471dd297468eb06453b 100644
--- a/dist.linux/share/cellframe-node.tsan.service
+++ b/dist.linux/share/cellframe-node.tsan.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-node.ubsan.service b/dist.linux/share/cellframe-node.ubsan.service
index 798bd9d2b9cd9b0ccc23e4c09067e9efbdc58471..885418a9d7297b162f9e9d1ac10ad81dcbf0ec28 100644
--- a/dist.linux/share/cellframe-node.ubsan.service
+++ b/dist.linux/share/cellframe-node.ubsan.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-updater.service b/dist.linux/share/cellframe-updater.service
index a1f119ebebe98718e071493ebdb9395efb5241ca..e01df7b55a6df5f6d860952ad1c806d38f1f0b41 100644
--- a/dist.linux/share/cellframe-updater.service
+++ b/dist.linux/share/cellframe-updater.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Updater
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node/
@@ -11,4 +12,4 @@ Group=root
 LogNamespace=cellframe
 
 [Install]
-WantedBy=timers.target
\ No newline at end of file
+WantedBy=timers.target
diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index fd624cb1527933dd4af6f022553d09c2e8d70d8a..40f052b1e26e9370e92612de0b9994cea11ac175 100644
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -137,8 +137,8 @@ wallets_path={PREFIX}/var/lib/wallet
 ca_folders=[{PREFIX}/var/lib/ca,{PREFIX}/share/ca]
 
 [global_db]
+path={PREFIX}/var/lib/global_db
 #driver={DB_DRIVER}
-#path={PREFIX}/var/lib/global_db
 #debug_more=true
 
 # Plugins