diff --git a/modules/aws/dam-base-instance/main.tf b/modules/aws/dam-base-instance/main.tf
index d98250b7..baef26bc 100644
--- a/modules/aws/dam-base-instance/main.tf
+++ b/modules/aws/dam-base-instance/main.tf
@@ -46,7 +46,6 @@ resource "aws_instance" "dsf_base_instance" {
     volume_size           = var.ebs.volume_size
     volume_type           = var.ebs.volume_type
     delete_on_termination = true
-    tags                  = merge(var.tags, { Name = var.name })
   }
   iam_instance_profile = local.instance_profile
   network_interface {
@@ -60,6 +59,7 @@ resource "aws_instance" "dsf_base_instance" {
   #   http_tokens = "required"
   # }
   tags = merge(var.tags, { Name = var.name })
+  volume_tags = merge(var.tags, { Name = var.name })
 }
 
 resource "aws_network_interface" "eni" {
diff --git a/modules/aws/db-with-agent/main.tf b/modules/aws/db-with-agent/main.tf
index 66ac4527..0e76a9ae 100644
--- a/modules/aws/db-with-agent/main.tf
+++ b/modules/aws/db-with-agent/main.tf
@@ -39,4 +39,5 @@ resource "aws_instance" "agent" {
     http_tokens   = "required"
   }
   tags = merge(var.tags, { Name = join("-", [var.friendly_name]) })
+  volume_tags = merge(var.tags, { Name = var.friendly_name })
 }
diff --git a/modules/aws/dra-admin/main.tf b/modules/aws/dra-admin/main.tf
index 08b292bd..e5374a5e 100644
--- a/modules/aws/dra-admin/main.tf
+++ b/modules/aws/dra-admin/main.tf
@@ -39,7 +39,6 @@ resource "aws_instance" "dsf_base_instance" {
     volume_size           = var.ebs.volume_size
     volume_type           = var.ebs.volume_type
     delete_on_termination = true
-    tags                  = merge(var.tags, { Name = var.name })
   }
   iam_instance_profile = local.instance_profile
   network_interface {
@@ -53,6 +52,7 @@ resource "aws_instance" "dsf_base_instance" {
     http_tokens   = "required"
   }
   tags = merge(var.tags, { Name = var.name })
+  volume_tags = merge(var.tags, { Name = var.name })
 }
 
 resource "aws_network_interface" "eni" {
diff --git a/modules/aws/dra-analytics/main.tf b/modules/aws/dra-analytics/main.tf
index 107a3eb6..95d2c8b4 100644
--- a/modules/aws/dra-analytics/main.tf
+++ b/modules/aws/dra-analytics/main.tf
@@ -33,7 +33,6 @@ resource "aws_instance" "dsf_base_instance" {
     volume_size           = var.ebs.volume_size
     volume_type           = var.ebs.volume_type
     delete_on_termination = true
-    tags                  = merge(var.tags, { Name = var.name })
   }
   iam_instance_profile = local.instance_profile
   network_interface {
@@ -47,6 +46,7 @@ resource "aws_instance" "dsf_base_instance" {
     http_tokens   = "required"
   }
   tags = merge(var.tags, { Name = var.name })
+  volume_tags = merge(var.tags, { Name = var.name })
 }
 
 resource "aws_network_interface" "eni" {