diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d762ad8421d511e99523d0f071e3622244b80a1..832824f94fefff8e08936f70a3440a3fe32b6255 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   STABLE_IMAGE_NAME: "$CI_REGISTRY_IMAGE/stable:latest"
   BUILD_IMAGE_NAME: "$CI_REGISTRY_IMAGE/branches/$CI_COMMIT_REF_SLUG-$TERRAFORM_VERSION:$CI_COMMIT_SHA"
   RELEASE_IMAGE_NAME: "$CI_REGISTRY_IMAGE/releases/$TERRAFORM_VERSION"
-  TF_ADDRESS: "$CI_API_V4_URL/projects/$CI_PROJECT_ID/terraform/state/$CI_PIPELINE_IID-$STATE_NAME"
+  TF_ADDRESS: "$CI_API_V4_URL/projects/$CI_PROJECT_ID/terraform/state/$CI_COMMIT_REF_SLUG-$STATE_NAME"
   TFPLANTOOL_VERSION: "v0.1.0"
 
 .versions: