diff --git a/roles/ci_resultsdb/files/httpd.service b/roles/ci_resultsdb/files/httpd.service
new file mode 100644
index 0000000000..eedb19cd59
--- /dev/null
+++ b/roles/ci_resultsdb/files/httpd.service
@@ -0,0 +1,2 @@
+[Service]
+Restart=on-failure
diff --git a/roles/ci_resultsdb/tasks/main.yml b/roles/ci_resultsdb/tasks/main.yml
index e13dbab29c..fdcd116f2f 100644
--- a/roles/ci_resultsdb/tasks/main.yml
+++ b/roles/ci_resultsdb/tasks/main.yml
@@ -7,6 +7,13 @@
   tags:
   - packages
 
+- name: override httpd service to restart on failure
+  copy: dest=/etc/systemd/system/httpd.service
+        src=httpd.service
+  notify:
+    - reload systemd
+    - reload httpd
+        
 - name: Create /etc/ci-resultsdb-listener/
   file: name=/etc/ci-resultsdb-listener/
         state=directory