diff --git a/modules/firehose/CHANGELOG.md b/modules/firehose/CHANGELOG.md
index f81664f8..a7944612 100644
--- a/modules/firehose/CHANGELOG.md
+++ b/modules/firehose/CHANGELOG.md
@@ -3,4 +3,4 @@
 ## firehose
 
 ### version / full date
-* [Update/17-Aug-2023] fix duplicate IAM issue
\ No newline at end of file
+* [Update/5-Sep-2023] fix firehose policy management
\ No newline at end of file
diff --git a/modules/firehose/main.tf b/modules/firehose/main.tf
index 7c337b2e..9631fadb 100644
--- a/modules/firehose/main.tf
+++ b/modules/firehose/main.tf
@@ -32,7 +32,7 @@ locals {
     terraform-module         = "kinesis-firehose-to-coralogix"
     terraform-module-version = "v0.1.0"
     managed-by               = "coralogix-terraform"
-    custom_endpoint          = var.coralogix_firehose_custom_endpoint != null ? var.coralogix_firehose_custom_endpoint : ""
+    custom_endpoint          = var.coralogix_firehose_custom_endpoint != null ? var.coralogix_firehose_custom_endpoint : "_default_"
   })
 
   # default namings
@@ -137,6 +137,7 @@ resource "aws_iam_role" "firehose_to_coralogix" {
   }
 }
 
+
 ################################################################################
 # Firehose Logs Stream
 ################################################################################
@@ -239,10 +240,10 @@ resource "aws_iam_role_policy_attachment" "additional_policy_attachment_2" {
 # Firehose Metrics Stream
 ################################################################################
 
-resource "aws_iam_role_policy" "firehose_to_coralogix_metric_policy" {
+resource "aws_iam_policy" "firehose_to_coralogix_metric_policy" {
   count  = var.metric_enable == true ? 1 : 0
-  name   = "${var.firehose_stream}-metrics-addon"
-  role   = aws_iam_role.firehose_to_coralogix.id
+  name   = "${var.firehose_stream}-metrics-policy"
+  tags   = local.tags
   policy = <<EOF
 {
     "Version": "2012-10-17",
@@ -313,6 +314,12 @@ resource "aws_iam_role_policy" "firehose_to_coralogix_metric_policy" {
 EOF
 }
 
+resource "aws_iam_role_policy_attachment" "firehose_to_coralogix_metric_policy" {
+  count      = var.metric_enable == true ? 1 : 0
+  policy_arn = aws_iam_policy.firehose_to_coralogix_metric_policy[count.index].arn
+  role       = aws_iam_role.firehose_to_coralogix.name
+}
+
 data "aws_iam_policy_document" "lambda_assume_role" {
   count = var.metric_enable == true ? 1 : 0
   statement {