diff --git a/modules/codebuild/main.tf b/modules/codebuild/main.tf
index f50a412..1fd4903 100644
--- a/modules/codebuild/main.tf
+++ b/modules/codebuild/main.tf
@@ -1,10 +1,18 @@
 resource "aws_s3_bucket" "artifacts" {
-  bucket = "cloudcasts-${var.infra_env}-artifacts"
+  bucket = "cloudcasts-artifacts"
   acl    = "private"
+
+  tags = {
+    Name        = "cloudcasts - Artifacts Bucket"
+    Environment = var.infra_env
+    Project     = "cloudcasts"
+    Role        = "build"
+    ManagedBy   = "terraform"
+  }
 }
 
 resource "aws_iam_role" "this" {
-  name = "cloudcasts-${var.infra_env}-codebuild-role"
+  name = "cloudcasts-codebuild-role"
 
   assume_role_policy = <<EOF
 {
@@ -69,7 +77,7 @@ POLICY
 }
 
 resource "aws_codebuild_project" "this" {
-  name = "cloudcasts-${var.infra_env}-app-builder"
+  name = "cloudcasts-app-builder"
   description   = "Building CloudCasts Sample App"
   service_role = aws_iam_role.this.arn
 
@@ -96,13 +104,13 @@ resource "aws_codebuild_project" "this" {
 
   logs_config {
     cloudwatch_logs {
-      group_name = "codebuild/cloudcasts/${var.infra_env}"
+      group_name = "codebuild/cloudcasts"
       stream_name = "builds"
     }
 
 //    s3_logs {
 //      status = "ENABLED"
-//      location = "${aws_s3_bucket.artifacts.id}/${var.infra_env}-build-log"
+//      location = "${aws_s3_bucket.artifacts.id}/build-log"
 //    }
   }
 
@@ -114,7 +122,7 @@ resource "aws_codebuild_project" "this" {
   }
 
   tags = {
-    Name        = "cloudcasts - ${var.infra_env} - App Builder"
+    Name        = "cloudcasts - App Builder"
     Environment = var.infra_env
     Project     = "cloudcasts"
     Role        = "build"
diff --git a/modules/ec2/asg.tf b/modules/ec2/asg.tf
index 468591f..99fd308 100644
--- a/modules/ec2/asg.tf
+++ b/modules/ec2/asg.tf
@@ -7,9 +7,9 @@ resource "aws_autoscaling_group" "this" {
   name                = "cloudcasts-${var.infra_env}-${var.infra_role}-asg"
   vpc_zone_identifier = var.asg_subnets
 
-  min_size             = 0
-  max_size             = 5
-  desired_capacity     = 2
+  min_size             = var.min_size # 0
+  max_size             = var.max_size # 5
+  desired_capacity     = var.desired_capacity # 2
   termination_policies = ["OldestInstance"]
 
   health_check_type         = var.infra_role == "http" ? "ELB" : "EC2"
diff --git a/modules/ec2/variables.tf b/modules/ec2/variables.tf
index 8fdaf53..5f401d0 100644
--- a/modules/ec2/variables.tf
+++ b/modules/ec2/variables.tf
@@ -71,4 +71,19 @@ variable "vpc_id" {
 variable "artifact_bucket" {
   type        = string
   description = "Application artifact bucket"
+}
+
+variable "min_size" {
+  type = number
+  description = "ASG minimum size"
+}
+
+variable "max_size" {
+  type = number
+  description = "ASG maximum size"
+}
+
+variable "desired_capacity" {
+  type = number
+  description = "ASG desired capacity"
 }
\ No newline at end of file
diff --git a/production/main.tf b/production/main.tf
index 276a5de..d777d9b 100644
--- a/production/main.tf
+++ b/production/main.tf
@@ -80,7 +80,7 @@ data "aws_ami" "app" {
 # Resources
 ##
 module "vpc" {
-  source = "./modules/vpc"
+  asource = "../modules/vpc"
 
   infra_env       = var.infra_env
   vpc_cidr        = "10.0.0.0/17"
@@ -90,7 +90,7 @@ module "vpc" {
 }
 
 module "autoscale_web" {
-  source = "./modules/ec2"
+  asource = "../modules/ec2"
 
   ami             = data.aws_ami.app.id
   git_url         = var.git_url
@@ -108,7 +108,7 @@ module "autoscale_web" {
 }
 
 module "autoscale_queue" {
-  source = "./modules/ec2"
+  asource = "../modules/ec2"
 
   ami             = data.aws_ami.app.id
   git_url         = var.git_url
@@ -125,7 +125,7 @@ module "autoscale_queue" {
 }
 
 module "deploy_app" {
-  source = "./modules/codedeploy"
+  asource = "../modules/codedeploy"
 
   infra_env    = var.infra_env
   deploy_groups = {
diff --git a/staging/main.tf b/staging/main.tf
index 6555d00..55be45f 100644
--- a/staging/main.tf
+++ b/staging/main.tf
@@ -80,7 +80,7 @@ data "aws_ami" "app" {
 # Resources
 ##
 module "vpc" {
-  source = "./modules/vpc"
+  asource = "../modules/vpc"
 
   infra_env       = var.infra_env
   vpc_cidr        = "10.0.0.0/17"
@@ -90,7 +90,7 @@ module "vpc" {
 }
 
 module "autoscale_web" {
-  source = "./modules/ec2"
+  asource = "../modules/ec2"
 
   ami             = data.aws_ami.app.id
   git_url         = var.git_url
@@ -108,7 +108,7 @@ module "autoscale_web" {
 }
 
 module "autoscale_queue" {
-  source = "./modules/ec2"
+  asource = "../modules/ec2"
 
   ami             = data.aws_ami.app.id
   git_url         = var.git_url
@@ -125,7 +125,7 @@ module "autoscale_queue" {
 }
 
 module "deploy_app" {
-  source = "./modules/codedeploy"
+  asource = "../modules/codedeploy"
 
   infra_env    = var.infra_env
   deploy_groups = {