diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index 225bf85332..4787630809 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -174,7 +174,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 f003465226..f7b8eed1aa 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -143,7 +143,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 29ce487b70..843b9fcd4c 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -132,7 +132,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