diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index 922debb56a28f7a7a49198578504225137ad4f64..260d6e36b08382652a8a6ef67596b717aef71a76 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -193,5 +193,5 @@ include:
       state_name: $[[ inputs.state_name ]]
 
 # NOTE: we have to define this `needs` here, because inputs don't support arrays, yet.
-delete-state:
+$[[ inputs.job_name_prefix ]]delete-state:
   needs: ['$[[ inputs.job_name_prefix ]]destroy']
diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml
index fe136c66ce7e4288c2c342dafc223d21998625d9..d64a448a72361ee08c2e714a1ad4d6d61efee169 100644
--- a/templates/validate-plan-destroy.yml
+++ b/templates/validate-plan-destroy.yml
@@ -160,5 +160,5 @@ include:
       state_name: $[[ inputs.state_name ]]
 
 # NOTE: we have to define this `needs` here, because inputs don't support arrays, yet.
-delete-state:
+$[[ inputs.job_name_prefix ]]delete-state:
   needs: ['$[[ inputs.job_name_prefix ]]destroy']