diff --git a/main.tf b/main.tf
index c0430f68..85f3f2c3 100755
--- a/main.tf
+++ b/main.tf
@@ -255,7 +255,6 @@ data "aws_iam_policy_document" "default" {
       "elasticloadbalancing:RegisterTargets",
       "elasticloadbalancing:DeregisterTargets",
       "iam:ListRoles",
-      "iam:PassRole",
       "logs:CreateLogGroup",
       "logs:PutRetentionPolicy",
       "rds:DescribeDBEngineVersions",
@@ -281,6 +280,21 @@ data "aws_iam_policy_document" "default" {
     effect = "Allow"
   }
 
+  statement {
+    sid = "AllowPassRole"
+
+    actions = [
+      "iam:PassRole"
+    ]
+
+    resources = [
+      join("", aws_iam_role.ec2.*.arn),
+      join("", aws_iam_role.service.*.arn)
+    ]
+
+    effect = "Allow"
+  }
+
   statement {
     sid = "AllowS3OperationsOnElasticBeanstalkBuckets"