diff --git a/justfile b/justfile
index 22c2174ba4..2db68b3c90 100644
--- a/justfile
+++ b/justfile
@@ -84,7 +84,10 @@ undeploy:
     fi
     ns=$(cat ./{{ workspace_dir }}/just.namespace)
     if kubectl get ns $ns 2> /dev/null; then
-        kubectl delete -f ./{{ workspace_dir }}/deployment
+        kubectl delete \
+            -f ./{{ workspace_dir }}/deployment \
+            --grace-period=120 \
+            --timeout=10m
     fi
 
 # Create a CoCo-enabled AKS cluster.