diff --git a/infrastructure/database.tf b/infrastructure/database.tf
index fd516fb92..bda2e8366 100644
--- a/infrastructure/database.tf
+++ b/infrastructure/database.tf
@@ -83,9 +83,11 @@ resource "aws_instance" "db_accessor" {
   associate_public_ip_address = false
 
   tags = {
+    Name    = "${var.project}-${var.stage}-db-accessor"
     Project = var.project
     Stage   = var.stage
   }
+
   root_block_device {
     volume_size = 1000
   }
diff --git a/infrastructure/elastic.tf b/infrastructure/elastic.tf
index cbe758530..6e380347f 100644
--- a/infrastructure/elastic.tf
+++ b/infrastructure/elastic.tf
@@ -6,11 +6,12 @@ resource "aws_instance" "elk_stack" {
   instance_type               = var.elk_instance_class
   associate_public_ip_address = false
 
-
   tags = {
+    Name    = "${var.project}-${var.stage}-elk-stack"
     Project = var.project
     Stage   = var.stage
   }
+
   root_block_device {
     volume_size = 1000
   }