diff --git a/terraform-modules/aws/eks/main.tf b/terraform-modules/aws/eks/main.tf
index e42bd27b3..5b91f5bc8 100644
--- a/terraform-modules/aws/eks/main.tf
+++ b/terraform-modules/aws/eks/main.tf
@@ -49,10 +49,11 @@ https://aws.amazon.com/blogs/containers/amazon-ebs-csi-driver-is-now-generally-a
 resource "aws_eks_addon" "csi_driver" {
   cluster_name             = module.eks.cluster_id
   addon_name               = "aws-ebs-csi-driver"
-  addon_version            = "v1.11.4-eksbuild.1"
+  addon_version            = "v1.16.0-eksbuild.1"
   service_account_role_arn = aws_iam_role.eks_ebs_csi_driver.arn
 }
 
+
 data "aws_iam_policy_document" "csi" {
   statement {
     actions = ["sts:AssumeRoleWithWebIdentity"]
@@ -73,7 +74,7 @@ data "aws_iam_policy_document" "csi" {
 
 resource "aws_iam_role" "eks_ebs_csi_driver" {
   assume_role_policy = data.aws_iam_policy_document.csi.json
-  name               = "eks-ebs-csi-driver"
+  name               = "eks-ebs-csi-driver-${var.cluster_name}"
 }
 
 resource "aws_iam_role_policy_attachment" "amazon_ebs_csi_driver" {