diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e1e1cd8c55b85f5f249412c4b10633f6bb007cf..43988350c5410dc19c1340efdda9a1f9a1a6fa69 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,5 +27,5 @@ because components are not yet properly supported in self-managed instances.
 That is, they are not bundled and it's not possible to use a component across instances.
 
 The OpenTofu CI/CD job and pipeline templates can be generated using `make backports`.
-The output is generated into the `backports` folder. Please contribute those files
-only upon manual inspection to the canonical GitLab repository.
+The output is generated into the `backports` folder. 
+Please contribute those files only upon full manual inspection to the canonical GitLab repository.
diff --git a/Makefile b/Makefile
index 741a17b47bf9233f21ef7f9af4afe1936c40af41..d8c7ff9254f3d3a301ce6d4c73107d25cb5b20a6 100644
--- a/Makefile
+++ b/Makefile
@@ -52,3 +52,4 @@ backports:
 	@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 's/^delete-state:$$/.opentofu:delete-state:/'
diff --git a/backports/OpenTofu.gitlab-ci.yml b/backports/OpenTofu.gitlab-ci.yml
index 7632da7b1facb56d91910553df76045e025a9c9e..83be36baefe19a33712183dca19ea81385d70ebd 100644
--- a/backports/OpenTofu.gitlab-ci.yml
+++ b/backports/OpenTofu.gitlab-ci.yml
@@ -13,7 +13,7 @@
 # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/OpenTofu.gitlab-ci.yml
 
 include:
-  - local: /backports/OpenTofu/Base.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/OpenTofu/Base.gitlab-ci.yml
+  - template: OpenTofu/Base.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/OpenTofu/Base.gitlab-ci.yml
 
 stages: [validate, test, build, deploy]
 
diff --git a/backports/OpenTofu/Base.gitlab-ci.yml b/backports/OpenTofu/Base.gitlab-ci.yml
index adec96617f498ae8228c7f177278d8d4a58d2ffb..96f6f50bf7c85e404526e262419e89227970b20f 100644
--- a/backports/OpenTofu/Base.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.gitlab-ci.yml
@@ -98,7 +98,7 @@ variables:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $TF_AUTO_DESTROY == "true"
     - when: manual
 
-delete-state:
+.opentofu:delete-state:
   extends: .opentofu:default
   stage: cleanup
   needs: [.opentofu:destroy]
diff --git a/tests/integration-tests/BackportTemplates.gitlab-ci.yml b/tests/integration-tests/BackportTemplates.gitlab-ci.yml
index 316ec52e1a81bd8153a38202856e3d3987bf816e..113c20d09f47e9d153f57969c4f4572c5421586f 100644
--- a/tests/integration-tests/BackportTemplates.gitlab-ci.yml
+++ b/tests/integration-tests/BackportTemplates.gitlab-ci.yml
@@ -1,25 +1,31 @@
 include:
-  - local: /backports/OpenTofu.gitlab-ci.yml
+  - local: /backports/OpenTofu/Base.gitlab-ci.yml
 
 stages: [validate, test, build, deploy, cleanup]
 
 # Required to run everything immediately, instead of manually.
 
 fmt:
+  extends: .opentofu:fmt
   rules: [{when: always}]
 
 validate:
+  extends: .opentofu:validate
   rules: [{when: always}]
 
 plan:
+  extends: .opentofu:plan
   rules: [{when: always}]
 
 apply: 
+  extends: .opentofu:apply
   rules: [{when: always}]
 
 destroy:
+  extends: .opentofu:destroy
   rules: [{when: always}]
 
 delete-state:
+  extends: .opentofu:delete-states
   rules: [{when: always}]