diff --git a/.trivyignore b/.trivyignore
new file mode 100644
index 00000000..5c1001e3
--- /dev/null
+++ b/.trivyignore
@@ -0,0 +1,2 @@
+# Ignore misconfigurations
+AVD-AZU-0012
diff --git a/examples/all-combined/imagepull-apikey-secrets-manager/main.tf b/examples/all-combined/imagepull-apikey-secrets-manager/main.tf
index f3b8419c..609b7003 100644
--- a/examples/all-combined/imagepull-apikey-secrets-manager/main.tf
+++ b/examples/all-combined/imagepull-apikey-secrets-manager/main.tf
@@ -14,8 +14,8 @@ resource "ibm_iam_service_id" "image_secret_pull_service_id" {
 resource "ibm_iam_service_policy" "cr_policy" {
 
 
-  iam_service_id = ibm_iam_service_id.image_secret_pull_service_id.id
-  roles          = ["Reader"]
+  iam_id = ibm_iam_service_id.image_secret_pull_service_id.id
+  roles  = ["Reader"]
 
   resources {
     service           = "container-registry"
diff --git a/examples/all-combined/secretsmanager.tf b/examples/all-combined/secretsmanager.tf
index 0685bbb0..8f55a84e 100644
--- a/examples/all-combined/secretsmanager.tf
+++ b/examples/all-combined/secretsmanager.tf
@@ -72,8 +72,8 @@ resource "ibm_iam_service_id" "secret_puller" {
 
 # Create policy to allow new service id to pull secrets from secrets manager
 resource "ibm_iam_service_policy" "secret_puller_policy" {
-  iam_service_id = ibm_iam_service_id.secret_puller.id
-  roles          = ["Viewer", "SecretsReader"]
+  iam_id = ibm_iam_service_id.secret_puller.id
+  roles  = ["Viewer", "SecretsReader"]
 
   resources {
     service              = "secrets-manager"
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
index 4cc7aae2..a81e0ea4 100644
--- a/examples/basic/main.tf
+++ b/examples/basic/main.tf
@@ -290,8 +290,8 @@ resource "ibm_iam_service_id" "secret_puller" {
 
 # Create policy to allow new service id to pull secrets from secrets manager
 resource "ibm_iam_service_policy" "secret_puller_policy" {
-  iam_service_id = ibm_iam_service_id.secret_puller.id
-  roles          = ["Viewer", "SecretsReader"]
+  iam_id = ibm_iam_service_id.secret_puller.id
+  roles  = ["Viewer", "SecretsReader"]
 
   resources {
     service              = "secrets-manager"
diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf
index 0012682a..4ff725fa 100644
--- a/solutions/fully-configurable/main.tf
+++ b/solutions/fully-configurable/main.tf
@@ -278,9 +278,9 @@ locals {
 
 # Create policy to allow new service id to pull secrets from secrets manager
 resource "ibm_iam_service_policy" "cluster_secrets_store_secrets_puller_policy" {
-  for_each       = local.cluster_secrets_stores_policies_to_create_map
-  iam_service_id = each.value.accountServiceID
-  roles          = ["Viewer", "SecretsReader"]
+  for_each = local.cluster_secrets_stores_policies_to_create_map
+  iam_id   = each.value.accountServiceID
+  roles    = ["Viewer", "SecretsReader"]
   resources {
     service              = "secrets-manager"
     resource_instance_id = local.sm_guid
@@ -537,9 +537,9 @@ locals {
 
 # Create policy to allow new service id to pull secrets from secrets manager
 resource "ibm_iam_service_policy" "secrets_store_secrets_puller_policy" {
-  for_each       = local.secrets_stores_policies_to_create_map
-  iam_service_id = each.value.accountServiceID
-  roles          = ["Viewer", "SecretsReader"]
+  for_each = local.secrets_stores_policies_to_create_map
+  iam_id   = each.value.accountServiceID
+  roles    = ["Viewer", "SecretsReader"]
   resources {
     service              = "secrets-manager"
     resource_instance_id = local.sm_guid