diff --git a/roles/bugzilla2fedmsg/files/moksha-hub.service b/roles/bugzilla2fedmsg/files/moksha-hub.service
index 068e4acf87..ac9b90c309 100644
--- a/roles/bugzilla2fedmsg/files/moksha-hub.service
+++ b/roles/bugzilla2fedmsg/files/moksha-hub.service
@@ -8,6 +8,7 @@ ExecStart=/usr/bin/moksha-hub /etc/moksha/production.ini
 Type=simple
 User=fedmsg
 Group=fedmsg
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/fedmsg/gateway/files/fedmsg-gateway.service b/roles/fedmsg/gateway/files/fedmsg-gateway.service
index 1515e5182d..a72436c2af 100644
--- a/roles/fedmsg/gateway/files/fedmsg-gateway.service
+++ b/roles/fedmsg/gateway/files/fedmsg-gateway.service
@@ -9,6 +9,7 @@ Type=simple
 User=fedmsg
 Group=fedmsg
 LimitNOFILE=160000
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target