diff --git a/environment-provisioner/workflow-template.yaml b/environment-provisioner/workflow-template.yaml
index f20b032..e8987c6 100644
--- a/environment-provisioner/workflow-template.yaml
+++ b/environment-provisioner/workflow-template.yaml
@@ -5,6 +5,15 @@ metadata:
   namespace: argo-workflows
 spec:
   serviceAccountName: argo-workflow
+  # Clean up pods after workflow completion
+  podGC:
+    strategy: OnWorkflowSuccess    # Delete pods when workflow succeeds
+    deleteDelayDuration: 60s       # Wait 60s before deleting (allows log collection)
+  # Auto-delete workflow after completion
+  ttlStrategy:
+    secondsAfterCompletion: 3600   # Delete workflow 1 hour after completion
+    secondsAfterSuccess: 1800      # Delete workflow 30 min after success
+    secondsAfterFailure: 86400     # Keep failed workflows for 24 hours for debugging
   arguments:
     parameters:
     - name: namespace