diff --git a/build/ansible/roles/supervisord-init/files/supervisord.service b/build/ansible/roles/supervisord-init/files/supervisord.service
index fd7bf9183d..fb8a92c84f 100644
--- a/build/ansible/roles/supervisord-init/files/supervisord.service
+++ b/build/ansible/roles/supervisord-init/files/supervisord.service
@@ -5,10 +5,11 @@ After=network.target
 RequiresMountsFor=/srv
 
 [Service]
-Type=forking
+Type=simple
 # we need to wait till time is synchronized
 ExecStartPre=/usr/bin/sleep 10
 ExecStart=/usr/bin/supervisord -c /etc/supervisord.conf
+TimeoutStartSec=120
 
 [Install]
 WantedBy=multi-user.target