diff --git a/scripts/provision/centos_7.sh b/scripts/provision/centos_7.sh
index 99a5d46e9..2c094f81c 100755
--- a/scripts/provision/centos_7.sh
+++ b/scripts/provision/centos_7.sh
@@ -8,7 +8,7 @@ yum install -y \
   postgresql-server \
   systemd \
   iptables
-postgresql-setup initdb
+postgresql-setup --initdb --unit postgresql
 systemctl restart postgresql
 
 # Install WireGuard
diff --git a/scripts/provision/centos_8.sh b/scripts/provision/centos_8.sh
index c1f776294..c8a170763 100755
--- a/scripts/provision/centos_8.sh
+++ b/scripts/provision/centos_8.sh
@@ -8,7 +8,7 @@ yum install -y \
   postgresql-server \
   systemd \
   iptables
-postgresql-setup initdb
+postgresql-setup --initdb --unit postgresql
 systemctl restart postgresql
 
 # Install WireGuard
diff --git a/scripts/provision/fedora_33.sh b/scripts/provision/fedora_33.sh
index f1e6f8de9..99b1f5203 100755
--- a/scripts/provision/fedora_33.sh
+++ b/scripts/provision/fedora_33.sh
@@ -9,10 +9,10 @@ yum install -y \
   systemd \
   iptables \
   wireguard-tools
-postgresql-setup initdb
+postgresql-setup --initdb --unit postgresql
 systemctl restart postgresql
 
 rpm -ivh /tmp/firezone*.rpm
-systemctl start firezone || true
+systemctl start firezone
 systemctl status firezone.service
 journalctl -xeu firezone
diff --git a/scripts/provision/fedora_34.sh b/scripts/provision/fedora_34.sh
index f1e6f8de9..99b1f5203 100755
--- a/scripts/provision/fedora_34.sh
+++ b/scripts/provision/fedora_34.sh
@@ -9,10 +9,10 @@ yum install -y \
   systemd \
   iptables \
   wireguard-tools
-postgresql-setup initdb
+postgresql-setup --initdb --unit postgresql
 systemctl restart postgresql
 
 rpm -ivh /tmp/firezone*.rpm
-systemctl start firezone || true
+systemctl start firezone
 systemctl status firezone.service
 journalctl -xeu firezone