diff --git a/scripts/gencert.service b/scripts/gencert.service
index 4261da7f309..f4a6168ce50 100644
--- a/scripts/gencert.service
+++ b/scripts/gencert.service
@@ -6,8 +6,8 @@ After=forkexecd.service
 [Service]
 User=root
 Type=oneshot
-ExecStart=/bin/sh -c '/opt/xensource/libexec/gencert /etc/xensource/xapi-ssl.pem default \
-                   && /opt/xensource/libexec/gencert /etc/xensource/xapi-pool-tls.pem xapi:pool'
+ExecStart=/opt/xensource/libexec/gencert /etc/xensource/xapi-pool-tls.pem xapi:pool
+ExecStart=/opt/xensource/libexec/gencert /etc/xensource/xapi-ssl.pem default
 RemainAfterExit=yes
 
 [Install]