diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index 3eed7da80d..5a0000f9d2 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -157,7 +157,7 @@ outputs:
           map_merge:
             - octavia_health_manager:
                 start_order: 2
-                stop_grace_period: 300
+                stop_grace_period: 630
                 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 2a4d1bb787..c0d1ff826f 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -127,7 +127,7 @@ outputs:
         step_5:
           octavia_housekeeping:
             start_order: 2
-            stop_grace_period: 300
+            stop_grace_period: 630
             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 6f13aa14b0..b0e4a9eb1d 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -115,7 +115,7 @@ outputs:
         step_5:
           octavia_worker:
             start_order: 2
-            stop_grace_period: 300
+            stop_grace_period: 630
             image: *octavia_worker_image
             net: host
             privileged: false