diff --git a/.octopus/deployment_process.ocl b/.octopus/deployment_process.ocl
index 6f4f2d8..5b9fabd 100644
--- a/.octopus/deployment_process.ocl
+++ b/.octopus/deployment_process.ocl
@@ -15,7 +15,8 @@ step "plan-to-apply-a-terraform-template" {
             Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}"
             Octopus.Action.Terraform.AllowPluginDownloads = "True"
             Octopus.Action.Terraform.AzureAccount = "False"
-            Octopus.Action.Terraform.EnvVariables = "{\"TF_VAR_GITLAB_PROJECT_NAME\":\"#{GITLAB_PROJECT_NAME}\",\"TF_VAR_GITLAB_SHARED_RUNNER_ID\":\"#{GITLAB_SHARED_RUNNER_ID}\",\"TF_VAR_GITLAB_TOKEN\":\"#{GITLAB_TOKEN}\",\"TF_VAR_OCTO_TENANT_ID\":\"#{Octopus.Deployment.Tenant.Id}\",\"TF_VAR_OCTOAPI\":\"#{OCTOAPI}\",\"TF_VAR_Development\":\"#{Development}\"}"
+            Octopus.Action.Terraform.EnvVariables = "{}"
+            Octopus.Action.Terraform.FileSubstitution = "*.tfvars"
             Octopus.Action.Terraform.GoogleCloudAccount = "False"
             Octopus.Action.Terraform.ManagedAccount = "None"
             Octopus.Action.Terraform.PlanJsonOutput = "False"
@@ -74,7 +75,8 @@ step "terraform-apply" {
             Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}"
             Octopus.Action.Terraform.AllowPluginDownloads = "True"
             Octopus.Action.Terraform.AzureAccount = "False"
-            Octopus.Action.Terraform.EnvVariables = "{\"TF_VAR_GITLAB_PROJECT_NAME\":\"#{GITLAB_PROJECT_NAME}\",\"TF_VAR_GITLAB_SHARED_RUNNER_ID\":\"#{GITLAB_SHARED_RUNNER_ID}\",\"TF_VAR_GITLAB_TOKEN\":\"#{GITLAB_TOKEN}\",\"TF_VAR_OCTOAPI\":\"#{OCTOAPI}\",\"TF_VAR_OCTO_TENANT_ID\":\"#{Octopus.Deployment.Tenant.Id}\",\"TF_VAR_Development\":\"#{Development}\"}"
+            Octopus.Action.Terraform.EnvVariables = "{}"
+            Octopus.Action.Terraform.FileSubstitution = "*.tfvars"
             Octopus.Action.Terraform.GoogleCloudAccount = "False"
             Octopus.Action.Terraform.ManagedAccount = "None"
             Octopus.Action.Terraform.PlanJsonOutput = "False"