diff --git a/modules/integration_aws-amazonmq-rabbitmq/README.md b/modules/integration_aws-amazonmq-rabbitmq/README.md
index f4660fa38..3f3055e12 100644
--- a/modules/integration_aws-amazonmq-rabbitmq/README.md
+++ b/modules/integration_aws-amazonmq-rabbitmq/README.md
@@ -25,7 +25,7 @@ module "signalfx-detectors-integration-aws-amazonmq-rabbitmq" {
 
   environment    = var.environment
   notifications  = local.notifications
-  aws_account_id = "fillme"
+  aws_unique_id = "arn:aws:mq:<cluster_region>:<aws_account_id>:<cluster_name>"
 }
 ```
 
@@ -116,3 +116,4 @@ Here is the list of required metrics for detectors in this module.
 * [Terraform SignalFx detector](https://registry.terraform.io/providers/splunk-terraform/signalfx/latest/docs/resources/detector)
 * [Splunk Observability integrations](https://docs.splunk.com/Observability/gdi/get-data-in/integrations.html)
 * [AWS documentation: Monitoring Amazon MQ brokers](https://docs.aws.amazon.com/amazon-mq/latest/developer-guide/security-logging-monitoring-cloudwatch.html#rabbitmq-logging-monitoring)
+
diff --git a/modules/integration_aws-amazonmq-rabbitmq/filters.tf b/modules/integration_aws-amazonmq-rabbitmq/filters.tf
index 25428dd1b..f72b9a266 100644
--- a/modules/integration_aws-amazonmq-rabbitmq/filters.tf
+++ b/modules/integration_aws-amazonmq-rabbitmq/filters.tf
@@ -1,4 +1,3 @@
 locals {
-  filters = "filter('aws_account_id', '${var.aws_account_id}')"
-}
-
+  filters = "filter('AWSUniqueId', '${var.aws_unique_id}')"
+}
\ No newline at end of file
diff --git a/modules/integration_aws-amazonmq-rabbitmq/tags.tf b/modules/integration_aws-amazonmq-rabbitmq/tags.tf
index c2e8068a2..0efe228f8 100644
--- a/modules/integration_aws-amazonmq-rabbitmq/tags.tf
+++ b/modules/integration_aws-amazonmq-rabbitmq/tags.tf
@@ -1,3 +1,3 @@
 locals {
-  tags = ["integration", "aws-elasticache-common"]
+  tags = ["integration", "aws-amazonmq-rabbitmq"]
 }
diff --git a/modules/integration_aws-amazonmq-rabbitmq/variables.tf b/modules/integration_aws-amazonmq-rabbitmq/variables.tf
index b792c59a9..8f898ab51 100644
--- a/modules/integration_aws-amazonmq-rabbitmq/variables.tf
+++ b/modules/integration_aws-amazonmq-rabbitmq/variables.tf
@@ -1,5 +1,3 @@
-# messages_ready detector
-
-variable "aws_account_id" {
+variable "aws_unique_id" {
   type = string
-}
+}
\ No newline at end of file