diff --git a/build/systemd/spinifex-awsgw.service b/build/systemd/spinifex-awsgw.service
index 7558127d1..d6d7d2511 100644
--- a/build/systemd/spinifex-awsgw.service
+++ b/build/systemd/spinifex-awsgw.service
@@ -8,6 +8,7 @@ Requires=spinifex-nats.service
 Type=simple
 User=spinifex
 Group=spinifex
+ExecStartPre=/bin/sh -c 'NATS_HOST=$(grep "^listen:" /etc/spinifex/nats/nats.conf | sed "s/listen: *//;s/:.*//"); for i in $(seq 1 30); do nc -z ${NATS_HOST:-127.0.0.1} 4222 && exit 0; sleep 1; done; exit 1'
 ExecStart=/usr/local/bin/spx service awsgw start
 Restart=on-failure
 RestartSec=5
diff --git a/build/systemd/spinifex-daemon.service b/build/systemd/spinifex-daemon.service
index d9969d1ad..20be3b16f 100644
--- a/build/systemd/spinifex-daemon.service
+++ b/build/systemd/spinifex-daemon.service
@@ -8,6 +8,7 @@ Requires=spinifex-nats.service
 Type=simple
 User=spinifex
 Group=spinifex
+ExecStartPre=/bin/sh -c 'NATS_HOST=$(grep "^listen:" /etc/spinifex/nats/nats.conf | sed "s/listen: *//;s/:.*//"); for i in $(seq 1 30); do nc -z ${NATS_HOST:-127.0.0.1} 4222 && exit 0; sleep 1; done; exit 1'
 ExecStart=/usr/local/bin/spx service spinifex start
 Restart=on-failure
 RestartSec=5
diff --git a/build/systemd/spinifex-predastore.service b/build/systemd/spinifex-predastore.service
index fd63b4535..6f8b4bbab 100644
--- a/build/systemd/spinifex-predastore.service
+++ b/build/systemd/spinifex-predastore.service
@@ -8,6 +8,7 @@ Requires=spinifex-nats.service
 Type=simple
 User=spinifex
 Group=spinifex
+ExecStartPre=/bin/sh -c 'NATS_HOST=$(grep "^listen:" /etc/spinifex/nats/nats.conf | sed "s/listen: *//;s/:.*//"); for i in $(seq 1 30); do nc -z ${NATS_HOST:-127.0.0.1} 4222 && exit 0; sleep 1; done; exit 1'
 ExecStart=/usr/local/bin/spx service predastore start
 Restart=on-failure
 RestartSec=5
diff --git a/build/systemd/spinifex-viperblock.service b/build/systemd/spinifex-viperblock.service
index 4741be25b..7fbf1b66e 100644
--- a/build/systemd/spinifex-viperblock.service
+++ b/build/systemd/spinifex-viperblock.service
@@ -8,6 +8,7 @@ Requires=spinifex-nats.service
 Type=simple
 User=spinifex
 Group=spinifex
+ExecStartPre=/bin/sh -c 'NATS_HOST=$(grep "^listen:" /etc/spinifex/nats/nats.conf | sed "s/listen: *//;s/:.*//"); for i in $(seq 1 30); do nc -z ${NATS_HOST:-127.0.0.1} 4222 && exit 0; sleep 1; done; exit 1'
 ExecStart=/usr/local/bin/spx service viperblock start
 Restart=on-failure
 RestartSec=5
diff --git a/build/systemd/spinifex-vpcd.service b/build/systemd/spinifex-vpcd.service
index bf576ae8f..1ff12bd96 100644
--- a/build/systemd/spinifex-vpcd.service
+++ b/build/systemd/spinifex-vpcd.service
@@ -8,6 +8,7 @@ Requires=spinifex-nats.service
 Type=simple
 User=spinifex
 Group=spinifex
+ExecStartPre=/bin/sh -c 'NATS_HOST=$(grep "^listen:" /etc/spinifex/nats/nats.conf | sed "s/listen: *//;s/:.*//"); for i in $(seq 1 30); do nc -z ${NATS_HOST:-127.0.0.1} 4222 && exit 0; sleep 1; done; exit 1'
 ExecStart=/usr/local/bin/spx service vpcd start
 Restart=on-failure
 RestartSec=5