diff --git a/Makefile b/Makefile
index d8c7ff9254f3d3a301ce6d4c73107d25cb5b20a6..04e512283dee2928719c6c9f2dc7de586dc9304d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,5 +51,5 @@ backports:
 	@sed -i $(BACKPORTS_BASE_FILE) -e 's/^plan:$$/.opentofu:plan:/'
 	@sed -i $(BACKPORTS_BASE_FILE) -e 's/^apply:$$/.opentofu:apply:/'
 	@sed -i $(BACKPORTS_BASE_FILE) -e 's/destroy:/.opentofu:destroy:/'
-	@sed -i $(BACKPORTS_BASE_FILE) -e 's/\[destroy\]/[.opentofu:destroy]/'
+	@sed -i $(BACKPORTS_BASE_FILE) -e '/needs: \[destroy\]/d'
 	@sed -i $(BACKPORTS_BASE_FILE) -e 's/^delete-state:$$/.opentofu:delete-state:/'
diff --git a/backports/OpenTofu/Base.gitlab-ci.yml b/backports/OpenTofu/Base.gitlab-ci.yml
index 96f6f50bf7c85e404526e262419e89227970b20f..8fc6e5ae97c0e46a3c1712c91e0bf08fcc013a68 100644
--- a/backports/OpenTofu/Base.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.gitlab-ci.yml
@@ -101,7 +101,6 @@ variables:
 .opentofu:delete-state:
   extends: .opentofu:default
   stage: cleanup
-  needs: [.opentofu:destroy]
   resource_group: $TF_STATE_NAME
   rules:
     - when: never
diff --git a/tests/integration-tests/BackportTemplates.gitlab-ci.yml b/tests/integration-tests/BackportTemplates.gitlab-ci.yml
index b8964cbaa567de368905e243391870c45c45d39d..a6e872bf157d7ccef9513aacfa8de8a3742596fd 100644
--- a/tests/integration-tests/BackportTemplates.gitlab-ci.yml
+++ b/tests/integration-tests/BackportTemplates.gitlab-ci.yml
@@ -27,5 +27,6 @@ destroy:
 
 delete-state:
   extends: .opentofu:delete-state
+  needs: [destroy]
   rules: [{when: always}]