diff --git a/resources.tf b/resources.tf
index 6e3402c..02f0309 100644
--- a/resources.tf
+++ b/resources.tf
@@ -19,6 +19,7 @@ locals {
   common_tags = {
     Environment = var.environment
     BillingCode = var.billing_code
+    Workspace   = terraform.workspace
   }
 }
 
diff --git a/variables.tf b/variables.tf
index c36c85f..3293321 100644
--- a/variables.tf
+++ b/variables.tf
@@ -11,13 +11,11 @@ variable "region" {
 variable "prefix" {
   type        = string
   description = "(Optional) Prefix to use for all resources in this module. Default: globo-dev"
-  default     = "globo-dev"
 }
 
 variable "environment" {
   type        = string
   description = "(Optional) Environment of all resources"
-  default     = "development"
 }
 
 variable "billing_code" {
@@ -28,15 +26,10 @@ variable "billing_code" {
 variable "cidr_block" {
   type        = string
   description = "(Optional) The CIDR block for the VPC. Default:10.42.0.0/16"
-  default     = "10.42.0.0/16"
 }
 
 variable "public_subnets" {
   type        = map(string)
   description = "(Optional) Map of public subnets to create with CIDR blocks. Key will be used as subnet name with prefix. Default: {subnet-1 ="
-  default = {
-    public-1 = "10.42.10.0/24"
-    public-2 = "10.42.11.0/24"
-  }
 }