diff --git a/recipes-httpd/nginx/files/nginx.service b/recipes-httpd/nginx/files/nginx.service
index 5873491..3f9dd3d 100644
--- a/recipes-httpd/nginx/files/nginx.service
+++ b/recipes-httpd/nginx/files/nginx.service
@@ -4,6 +4,7 @@
 
 [Service]
 Type=forking
+SyslogIdentifier=nginx
 ExecStartPre=/usr/bin/env gen-cert.sh
 ExecStartPre=-/usr/bin/env mkdir /var/volatile/nginx/
 ExecStartPre=/usr/bin/env nginx -t -p /var/volatile/nginx
@@ -11,6 +12,9 @@
 ExecReload=/usr/bin/env kill -s HUP $MAINPID
 ExecStop=/usr/bin/env kill -s QUIT $MAINPID
 PrivateTmp=true
+# First time on system takes longer for initial setup so
+# give double normal timeout
+TimeoutStartSec=180
 
 [Install]
 WantedBy={SYSTEMD_DEFAULT_TARGET}