diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service
index 51ccf5357..956a2cd04 100644
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@@ -5,8 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall (bootup security)
-Before=network-pre.target
-Wants=network-pre.target
+Before=network.target
 Conflicts=iptables.service firewalld.service
 
 [Service]
diff --git a/Shorewall-lite/shorewall-lite.service b/Shorewall-lite/shorewall-lite.service
index ac4c5cc3d..9073b05bc 100644
--- a/Shorewall-lite/shorewall-lite.service
+++ b/Shorewall-lite/shorewall-lite.service
@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)
-After=network-online.target
+After=network.target
 Conflicts=iptables.service firewalld.service
 
 [Service]
diff --git a/Shorewall/shorewall.service b/Shorewall/shorewall.service
index 7124175cf..679eff3d8 100644
--- a/Shorewall/shorewall.service
+++ b/Shorewall/shorewall.service
@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall
-After=network-online.target
+After=network.target
 Conflicts=iptables.service firewalld.service
 
 [Service]
diff --git a/Shorewall6-lite/shorewall6-lite.service b/Shorewall6-lite/shorewall6-lite.service
index 3f2f9dd01..9a19257d0 100644
--- a/Shorewall6-lite/shorewall6-lite.service
+++ b/Shorewall6-lite/shorewall6-lite.service
@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall (lite)
-After=network-online.target
+After=network.target
 Conflicts=ip6tables.service firewalld.service
 
 [Service]
diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service
index 6a4a449a6..6e35ea0b6 100644
--- a/Shorewall6/shorewall6.service
+++ b/Shorewall6/shorewall6.service
@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall
-After=network-online.target
+After=network.target
 Conflicts=ip6tables.service firewalld.service
 
 [Service]