diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden b/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden
index 070205a9dfd301..22da52082c5ad4 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden
@@ -220,6 +220,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden b/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden
index ce5a2cf689b381..5bfb56e05b5833 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden
@@ -207,6 +207,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
@@ -262,4 +263,4 @@
         },
         "status": {}
     }
-}
\ No newline at end of file
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_class.golden b/components/ws-manager/pkg/manager/testdata/cdwp_class.golden
index 9fb3c2aeb6600b..da2322e91344a1 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_class.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_class.golden
@@ -221,6 +221,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "dnsPolicy": "None",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden b/components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden
index e582cdc03051e0..605e2d13fd0b63 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden
@@ -211,6 +211,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
@@ -266,4 +267,4 @@
         },
         "status": {}
     }
-}
\ No newline at end of file
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden b/components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden
index a21d308b858b44..c3b7fda8fbafea 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden
@@ -229,6 +229,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
@@ -284,4 +285,4 @@
         },
         "status": {}
     }
-}
\ No newline at end of file
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden b/components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden
index fa12ede72b3f32..03c16f3f67765c 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden
@@ -208,6 +208,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
@@ -263,4 +264,4 @@
         },
         "status": {}
     }
-}
\ No newline at end of file
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden b/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden
index ec52aeea6e1209..8c5abfef394444 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden
@@ -213,6 +213,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden b/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden
index d776b973b6c5e8..8fb51046788389 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden
@@ -253,6 +253,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden b/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden
index 8bedfebbb33ce7..251fb0dd3f1566 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden
@@ -205,6 +205,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden
index 7940789da8887e..3d461bb5d49f09 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden
@@ -238,6 +238,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden
index 7940789da8887e..3d461bb5d49f09 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden
@@ -238,6 +238,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden b/components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden
index 98e9b37a40dc4b..38532267daced7 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden
@@ -210,6 +210,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden
index ea7969574daaba..e5a1a020978111 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden
@@ -220,6 +220,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden
index ea7969574daaba..e5a1a020978111 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden
@@ -220,6 +220,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden
index 696db20896b6a6..079c3daa23d8db 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden
@@ -220,6 +220,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden b/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden
index 56d52af9fe5eb3..0ba7884300e8e3 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden
@@ -216,6 +216,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_secrets.golden b/components/ws-manager/pkg/manager/testdata/cdwp_secrets.golden
index 96f362076ef1f3..296101269e82ae 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_secrets.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_secrets.golden
@@ -225,6 +225,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
@@ -280,4 +281,4 @@
         },
         "status": {}
     }
-}
\ No newline at end of file
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_sshkeys.golden b/components/ws-manager/pkg/manager/testdata/cdwp_sshkeys.golden
index 50be2b6b7181e6..ddecf8cb2f2907 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_sshkeys.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_sshkeys.golden
@@ -217,6 +217,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_sys_envvars.golden b/components/ws-manager/pkg/manager/testdata/cdwp_sys_envvars.golden
index 161347cc07842d..a1363e64e928e3 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_sys_envvars.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_sys_envvars.golden
@@ -257,6 +257,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden b/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden
index 226701fcb9057a..4a6c3365a411f7 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden
@@ -220,6 +220,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_template.golden
index 39eeffd1ceb827..7e89693c6bd5bc 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_template.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_template.golden
@@ -216,6 +216,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden b/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden
index b8f1035bfa4bfd..cfebcdd38da282 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden
@@ -221,6 +221,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden b/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden
index 04ab00872c395a..d42a68368af246 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden
@@ -216,6 +216,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden b/components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden
index dcc33e10217be7..a72ec0eab4ace3 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden
@@ -235,6 +235,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden b/components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden
index 39eeffd1ceb827..7e89693c6bd5bc 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden
@@ -216,6 +216,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden b/components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden
index 7940789da8887e..3d461bb5d49f09 100644
--- a/components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden
+++ b/components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden
@@ -238,6 +238,7 @@
                 }
             ],
             "restartPolicy": "Never",
+            "terminationGracePeriodSeconds": 180,
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
             "securityContext": {