diff --git a/tofu/environments/prod/services/backend-service/terragrunt.hcl b/tofu/environments/prod/services/backend-service/terragrunt.hcl
index d2434b8a5..7c24f02f7 100644
--- a/tofu/environments/prod/services/backend-service/terragrunt.hcl
+++ b/tofu/environments/prod/services/backend-service/terragrunt.hcl
@@ -56,11 +56,7 @@ locals {
   environment = get_env("TF_VAR_environment")
   name_prefix = get_env("TF_VAR_name_prefix")
   region      = get_env("TF_VAR_region")
-  //project          = include.root.locals.project
-  //environment      = include.env.locals.environment
   short_name = include.root.locals.short_name
-  //name_prefix      = "tb-${include.root.locals.short_name}-${include.env.locals.environment}"
-  //region           = include.env.locals.region
   project_tags     = include.root.locals.tags
   environment_tags = include.env.locals.tags
   tags             = "${merge(local.project_tags, local.environment_tags)}"
@@ -75,19 +71,19 @@ inputs = {
   security_group      = dependency.backend-infra.outputs.security_group_id
   ecs_cluster         = dependency.backend-infra.outputs.cluster_id
   task_execution_role = dependency.vpc.outputs.ecs_execution_role
-  frontend_url        = get_env("frontend_url")   //"https://${local.project}.day"
-  short_base_url      = get_env("short_base_url") //"https://${local.short_name}.day"
-  app_env             = get_env("app_env")        //local.environment
-  sentry_dsn          = get_env("sentry_dsn")     //"https://5dddca3ecc964284bb8008bc2beef808@o4505428107853824.ingest.sentry.io/4505428124827648"
-  zoom_auth_callback  = get_env("zoom_callback")  //"https://${local.project}.day/api/v1/zoom/callback"
+  frontend_url        = get_env("TF_VAR_frontend_url")   
+  short_base_url      = get_env("TF_VAR_short_base_url") 
+  app_env             = get_env("TF_VAR_app_env")        
+  sentry_dsn          = get_env("TF_VAR_sentry_dsn")     
+  zoom_auth_callback  = get_env("TF_VAR_zoom_callback")  
   short_name          = local.short_name
   database_secret     = dependency.database.outputs.db_secret
-  db_enc_secret       = get_env("db_enc_secret")       //"arn:aws:secretsmanager:us-east-1:768512802988:secret:tb-apmt-production-db-secret-xcaWVh"
-  smtp_secret         = get_env("smtp_secret")         //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/socketlabs-UYmjaC"
-  google_oauth_secret = get_env("google_oauth_secret") //"arn:aws:secretsmanager:us-east-1:768512802988:secret:tb-apmt-production-google-cal-oauth-8x5LUO"
-  zoom_secret         = get_env("zoom_secret")         //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/zoom-S862zi"
-  fxa_secret          = get_env("fxa_secret")          //"arn:aws:secretsmanager:us-east-1:768512802988:secret:prod/appointment/fxa-lRA3qx"
+  db_enc_secret       = get_env("TF_VAR_db_enc_secret")  
+  smtp_secret         = get_env("TF_VAR_smtp_secret")    
+  google_oauth_secret = get_env("TF_VAR_google_oauth_secret")
+  zoom_secret         = get_env("TF_VAR_zoom_secret")        
+  fxa_secret          = get_env("TF_VAR_fxa_secret")         
   redis_endpoint      = dependency.cache.outputs.endpoint
-  log_level           = get_env("log_level")
+  log_level           = get_env("TF_VAR_log_level")
   tags                = local.tags
 }
\ No newline at end of file
diff --git a/tofu/environments/stage/services/backend-service/terragrunt.hcl b/tofu/environments/stage/services/backend-service/terragrunt.hcl
index af5308d57..0c7ca83c9 100644
--- a/tofu/environments/stage/services/backend-service/terragrunt.hcl
+++ b/tofu/environments/stage/services/backend-service/terragrunt.hcl
@@ -57,10 +57,7 @@ locals {
   name_prefix = get_env("TF_VAR_name_prefix")
   region      = get_env("TF_VAR_region")
   project     = include.root.locals.project
-  //environment      = include.env.locals.environment
   short_name = include.root.locals.short_name
-  //name_prefix      = "tb-${include.root.locals.short_name}-${include.env.locals.environment}"
-  //region           = include.env.locals.region
   project_tags     = include.root.locals.tags
   environment_tags = include.env.locals.tags
   tags             = "${merge(local.project_tags, local.environment_tags)}"
@@ -75,19 +72,19 @@ inputs = {
   security_group      = dependency.backend-infra.outputs.security_group_id
   ecs_cluster         = dependency.backend-infra.outputs.cluster_id
   task_execution_role = dependency.vpc.outputs.ecs_execution_role
-  frontend_url        = get_env("frontend_url")   //"https://${local.project}.day"
-  short_base_url      = get_env("short_base_url") //"https://${local.short_name}.day"
-  app_env             = get_env("app_env")        //local.environment
-  sentry_dsn          = get_env("sentry_dsn")     //"https://5dddca3ecc964284bb8008bc2beef808@o4505428107853824.ingest.sentry.io/4505428124827648"
-  zoom_auth_callback  = get_env("zoom_callback")  //"https://${local.project}.day/api/v1/zoom/callback"
+  frontend_url        = get_env("TF_VAR_frontend_url")   
+  short_base_url      = get_env("TF_VAR_short_base_url") 
+  app_env             = get_env("TF_VAR_app_env")        
+  sentry_dsn          = get_env("TF_VAR_sentry_dsn")     
+  zoom_auth_callback  = get_env("TF_VAR_zoom_callback")  
   short_name          = local.short_name
   database_secret     = dependency.database.outputs.db_secret
-  db_enc_secret       = get_env("db_enc_secret")       //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/db-secret-CYKglI"
-  smtp_secret         = get_env("smtp_secret")         //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/socketlabs-UYmjaC"
-  google_oauth_secret = get_env("google_oauth_secret") //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/google-cal-oauth-VevaSo"
-  zoom_secret         = get_env("zoom_secret")         //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/zoom-S862zi"
-  fxa_secret          = get_env("fxa_secret")          //"arn:aws:secretsmanager:us-east-1:768512802988:secret:staging/appointment/fxa-fxa-7koQF0"
-  log_level           = get_env("log_level")
+  db_enc_secret       = get_env("TF_VAR_db_enc_secret")       
+  smtp_secret         = get_env("TF_VAR_smtp_secret")         
+  google_oauth_secret = get_env("TF_VAR_google_oauth_secret") 
+  zoom_secret         = get_env("TF_VAR_zoom_secret")
+  fxa_secret          = get_env("TF_VAR_fxa_secret") 
+  log_level           = get_env("TF_VAR_log_level")
   redis_endpoint      = dependency.cache.outputs.endpoint
   tags                = local.tags
 }
\ No newline at end of file