diff --git a/deployment/live/cloudbuild/dev/terragrunt.hcl b/deployment/live/cloudbuild/dev/terragrunt.hcl
index 7ade7aa..d4b3c98 100644
--- a/deployment/live/cloudbuild/dev/terragrunt.hcl
+++ b/deployment/live/cloudbuild/dev/terragrunt.hcl
@@ -1,19 +1,11 @@
-include {
-  path = find_in_parent_folders()
-}
-
-terraform {
-  source = "${get_path_to_repo_root()}/deployment/modules/cloudbuild"
-}
-
-locals {
-  common_vars = read_terragrunt_config(find_in_parent_folders())
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
 }
 
 inputs = merge(
-  local.common_vars.locals,
+  include.root.locals,
   {
-    env                 = "dev"
     cloud_run_service   = "distributor-service-dev"
     slack_template_json = file("slack.json")
   }
diff --git a/deployment/live/cloudbuild/prod/terragrunt.hcl b/deployment/live/cloudbuild/prod/terragrunt.hcl
index ec61cc5..cd8ccb3 100644
--- a/deployment/live/cloudbuild/prod/terragrunt.hcl
+++ b/deployment/live/cloudbuild/prod/terragrunt.hcl
@@ -1,19 +1,11 @@
-include {
-  path = find_in_parent_folders()
-}
-
-terraform {
-  source = "${get_path_to_repo_root()}/deployment/modules/cloudbuild"
-}
-
-locals {
-  common_vars = read_terragrunt_config(find_in_parent_folders())
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
 }
 
 inputs = merge(
-  local.common_vars.locals,
+  include.root.locals,
   {
-    env                 = "prod"
     cloud_run_service   = "distributor-service-ci"
     slack_template_json = file("slack.json")
   }
diff --git a/deployment/live/cloudbuild/terragrunt.hcl b/deployment/live/cloudbuild/terragrunt.hcl
index 1d0ad67..958668f 100644
--- a/deployment/live/cloudbuild/terragrunt.hcl
+++ b/deployment/live/cloudbuild/terragrunt.hcl
@@ -1,3 +1,7 @@
+terraform {
+  source = "${get_repo_root()}/deployment/modules/cloudbuild"
+}
+
 locals {
   project_id  = "checkpoint-distributor"
   region      = "us-central1"
diff --git a/deployment/live/monitoring/ci/terragrunt.hcl b/deployment/live/monitoring/ci/terragrunt.hcl
index ade78bf..94ba5aa 100644
--- a/deployment/live/monitoring/ci/terragrunt.hcl
+++ b/deployment/live/monitoring/ci/terragrunt.hcl
@@ -1,19 +1,11 @@
-include {
-  path = find_in_parent_folders()
-}
-
-terraform {
-  source = "${get_path_to_repo_root()}/deployment/modules/monitoring"
-}
-
-locals {
-  common_vars = read_terragrunt_config(find_in_parent_folders())
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
 }
 
 inputs = merge(
-  local.common_vars.locals,
+  include.root.locals,
   {
-    env = "ci"
   }
 )
 
diff --git a/deployment/live/monitoring/dev/terragrunt.hcl b/deployment/live/monitoring/dev/terragrunt.hcl
index 89aa94f..94ba5aa 100644
--- a/deployment/live/monitoring/dev/terragrunt.hcl
+++ b/deployment/live/monitoring/dev/terragrunt.hcl
@@ -1,19 +1,11 @@
-include {
-  path = find_in_parent_folders()
-}
-
-terraform {
-  source = "${get_path_to_repo_root()}/deployment/modules/monitoring"
-}
-
-locals {
-  common_vars = read_terragrunt_config(find_in_parent_folders())
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
 }
 
 inputs = merge(
-  local.common_vars.locals,
+  include.root.locals,
   {
-    env = "dev"
   }
 )
 
diff --git a/deployment/live/monitoring/prod/terragrunt.hcl b/deployment/live/monitoring/prod/terragrunt.hcl
index ac324ba..94ba5aa 100644
--- a/deployment/live/monitoring/prod/terragrunt.hcl
+++ b/deployment/live/monitoring/prod/terragrunt.hcl
@@ -1,19 +1,11 @@
-include {
-  path = find_in_parent_folders()
-}
-
-terraform {
-  source = "${get_path_to_repo_root()}/deployment/modules/monitoring"
-}
-
-locals {
-  common_vars = read_terragrunt_config(find_in_parent_folders())
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
 }
 
 inputs = merge(
-  local.common_vars.locals,
+  include.root.locals,
   {
-    env = "prod"
   }
 )
 
diff --git a/deployment/live/monitoring/terragrunt.hcl b/deployment/live/monitoring/terragrunt.hcl
index 20e881b..bb08359 100644
--- a/deployment/live/monitoring/terragrunt.hcl
+++ b/deployment/live/monitoring/terragrunt.hcl
@@ -1,3 +1,7 @@
+terraform {
+  source = "${get_repo_root()}/deployment/modules/monitoring"
+}
+
 locals {
   project_id  = "checkpoint-distributor"
   region      = "us-central1"