diff --git a/main.tf b/main.tf
index 134ec3e..609b36a 100644
--- a/main.tf
+++ b/main.tf
@@ -62,12 +62,7 @@ module "cluster" {
       service_account_role_arn = module.efs_csi_irsa_role.iam_role_arn
     }
     aws-guardduty-agent = {
-      most_recent              = true
-      service_account_role_arn = module.guardduty_agent_irsa_role.iam_role_arn
-    }
-    aws-mountpoint-s3-csi-driver = {
-      most_recent              = true
-      service_account_role_arn = module.mountpoint_s3_csi_driver_irsa_role.iam_role_arn
+      most_recent = true
     }
     coredns = {
       most_recent = true
@@ -76,7 +71,8 @@ module "cluster" {
       most_recent = true
     }
     eks-pod-identity-agent = {
-      most_recent = true
+      most_recent    = true
+      before_compute = true
     }
     kube-proxy = {
       most_recent = true
@@ -96,6 +92,7 @@ module "cluster" {
     vpc-cni = {
       most_recent              = true
       service_account_role_arn = module.vpc_cni_irsa_role.iam_role_arn
+      before_compute           = true
     }
   }