diff --git a/products/accesscontextmanager/terraform.yaml b/products/accesscontextmanager/terraform.yaml
index 0e0d6e646838..a11fda4e45c6 100644
--- a/products/accesscontextmanager/terraform.yaml
+++ b/products/accesscontextmanager/terraform.yaml
@@ -19,6 +19,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       update_minutes: 6
       delete_minutes: 6
     autogen_async: true
+    id_format: "{{name}}"
     import_format: ["{{name}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
diff --git a/third_party/terraform/resources/resource_cloudiot_registry.go b/third_party/terraform/resources/resource_cloudiot_registry.go
index 60ca3aa38d87..e787fde7f0b5 100644
--- a/third_party/terraform/resources/resource_cloudiot_registry.go
+++ b/third_party/terraform/resources/resource_cloudiot_registry.go
@@ -404,6 +404,8 @@ func resourceCloudIoTRegistryRead(d *schema.ResourceData, meta interface{}) erro
 	}
 	d.Set("credentials", credentials)
 	d.Set("log_level", res.LogLevel)
+	// Removed Computed field must be set to nil to prevent spurious diffs
+	d.Set("event_notification_config", nil)
 
 	return nil
 }