diff --git a/openstack_operator/templates/heat/deployment.yml.j2 b/openstack_operator/templates/heat/deployment.yml.j2
index d8a84771..e76499c7 100644
--- a/openstack_operator/templates/heat/deployment.yml.j2
+++ b/openstack_operator/templates/heat/deployment.yml.j2
@@ -78,6 +78,10 @@ spec:
         readinessProbe:
           tcpSocket:
             port: heat-{{ component }}
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sleep", "5"]
         {% endif %}
         resources:
           limits:
diff --git a/openstack_operator/templates/horizon/deployment.yml.j2 b/openstack_operator/templates/horizon/deployment.yml.j2
index f0d9b74a..d2e13721 100644
--- a/openstack_operator/templates/horizon/deployment.yml.j2
+++ b/openstack_operator/templates/horizon/deployment.yml.j2
@@ -56,6 +56,10 @@ spec:
         readinessProbe:
           tcpSocket:
             port: horizon
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sleep", "5"]
         resources:
           limits:
             cpu: 2000m
diff --git a/openstack_operator/templates/keystone/deployment.yml.j2 b/openstack_operator/templates/keystone/deployment.yml.j2
index daa6fc40..69d8b8de 100644
--- a/openstack_operator/templates/keystone/deployment.yml.j2
+++ b/openstack_operator/templates/keystone/deployment.yml.j2
@@ -116,6 +116,10 @@ spec:
           httpGet:
             path: /v3
             port: keystone
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sleep", "5"]
         resources:
           limits:
             cpu: 2000m
diff --git a/openstack_operator/templates/magnum/deployment.yml.j2 b/openstack_operator/templates/magnum/deployment.yml.j2
index 179e73e8..3c0a8830 100644
--- a/openstack_operator/templates/magnum/deployment.yml.j2
+++ b/openstack_operator/templates/magnum/deployment.yml.j2
@@ -71,6 +71,10 @@ spec:
         readinessProbe:
           tcpSocket:
             port: magnum-{{ component }}
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sleep", "5"]
         {% endif %}
         resources:
           limits: