diff --git a/manifests/profile/base/apache.pp b/manifests/profile/base/apache.pp
index b3ae1fffe..a23c1d6f5 100644
--- a/manifests/profile/base/apache.pp
+++ b/manifests/profile/base/apache.pp
@@ -35,6 +35,12 @@ class tripleo::profile::base::apache(
   include ::apache::mod::status
   include ::apache::mod::ssl
 
+  # Automatic restart
+  ::systemd::dropin_file { 'httpd.conf':
+    unit    => 'httpd.service',
+    content => "[Service]\nRestart=always\n",
+  }
+
   if $enable_status_listener {
     if !defined(Apache::Listen[$status_listener]) {
       ::apache::listen {$status_listener: }
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp
index 48bdd8260..a21705ad0 100644
--- a/manifests/profile/base/database/mongodb.pp
+++ b/manifests/profile/base/database/mongodb.pp
@@ -67,5 +67,11 @@ class tripleo::profile::base::database::mongodb (
         'MemoryLimit' => $memory_limit
       }
     }
+
+    # Automatic restart
+    ::systemd::dropin_file { 'mongod.conf':
+      unit    => 'mongod.service',
+      content => "[Service]\nRestart=always\n",
+    }
   }
 }
diff --git a/manifests/profile/base/memcached.pp b/manifests/profile/base/memcached.pp
index e33999a12..35a7d1ffe 100644
--- a/manifests/profile/base/memcached.pp
+++ b/manifests/profile/base/memcached.pp
@@ -28,5 +28,11 @@ class tripleo::profile::base::memcached (
 ) {
   if $step >= 1 {
       include ::memcached
+
+      # Automatic restart
+      ::systemd::dropin_file { 'memcached.conf':
+        unit    => 'memcached.service',
+        content => "[Service]\nRestart=always\n",
+      }
   }
 }