diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index 628aba1f1a..8a77bff3bc 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -132,6 +132,7 @@ outputs:
         step_5:
           octavia_health_manager:
             start_order: 2
+            stop_grace_period: 300
             image: *octavia_health_manager_image
             net: host
             privileged: false
diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
index cae7db7ebc..ba21eb3328 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -131,6 +131,7 @@ outputs:
         step_5:
           octavia_housekeeping:
             start_order: 2
+            stop_grace_period: 300
             image: *octavia_housekeeping_image
             net: host
             privileged: false
diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index 2513e8d32f..b67ad9eb6b 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -119,6 +119,7 @@ outputs:
         step_5:
           octavia_worker:
             start_order: 2
+            stop_grace_period: 300
             image: *octavia_worker_image
             net: host
             privileged: false