diff --git a/nix-kubernetes/kubernetes.nix b/nix-kubernetes/kubernetes.nix
index 6ebb6dd..43aa124 100644
--- a/nix-kubernetes/kubernetes.nix
+++ b/nix-kubernetes/kubernetes.nix
@@ -17,7 +17,10 @@
           "com.coder.workspace.name" = "\${data.coder_workspace.me.name}";
         };
       };
+      # give the shutdown tasks enough time to run
+      timeouts.delete = "31m";
       spec = {
+        termination_grace_period_seconds = 1800;
         affinity.pod_anti_affinity.preferred_during_scheduling_ignored_during_execution = {
           weight = 1;
           pod_affinity_term = {