diff --git a/main.tf b/main.tf
index ac88770..74d2115 100644
--- a/main.tf
+++ b/main.tf
@@ -35,7 +35,7 @@ resource "aws_instance" "this" {
   associate_public_ip_address = length(var.public_subnets) > 0 ? true : false
   tags                        = merge({
     Name = "${var.env}-${var.name}"
-  }, local.tags)
+  }, var.tags)
 }
 
 module "asg_bastion" {
diff --git a/output.tf b/output.tf
index 15aa189..76036ba 100644
--- a/output.tf
+++ b/output.tf
@@ -1,9 +1,9 @@
 output "security_group" {
-  value = aws_security_group.this[0].id
+  value       = aws_security_group.this[0].id
   description = "The ID of the security group"
 }
 
 output "tags" {
-  value = var.tags
+  value       = var.tags
   description = "The tags for the bastion host"
 }