diff --git a/examples/firehose-logs/main.tf b/examples/firehose-logs/main.tf
index 9922ed1e..55431727 100644
--- a/examples/firehose-logs/main.tf
+++ b/examples/firehose-logs/main.tf
@@ -1,5 +1,5 @@
 module "cloudwatch_firehose_logs_coralogix" {
-  source                    = "github.com/coralogix/terraform-coralogix-aws//modules/firehose-logs"
+  source                    = "coralogix/aws/coralogix//modules/firehose-logs"
   firehose_stream           = var.firehose_stream
   private_key               = var.private_key
   coralogix_region          = var.coralogix_region
diff --git a/examples/firehose-metrics/main.tf b/examples/firehose-metrics/main.tf
index 7e05638d..7a47394e 100644
--- a/examples/firehose-metrics/main.tf
+++ b/examples/firehose-metrics/main.tf
@@ -1,5 +1,5 @@
 module "cloudwatch_firehose_metrics_coralogix" {
-  source                              = "github.com/coralogix/terraform-coralogix-aws//modules/firehose-metrics"
+  source                              = "coralogix/aws/coralogix//modules/firehose-metrics"
   firehose_stream                     = var.firehose_stream
   private_key                         = var.private_key
   enable_cloudwatch_metricstream      = var.enable_cloudwatch_metricstream
diff --git a/modules/firehose-logs/README.md b/modules/firehose-logs/README.md
index 93691310..b7dad11c 100644
--- a/modules/firehose-logs/README.md
+++ b/modules/firehose-logs/README.md
@@ -9,8 +9,8 @@ Firehose Logs module is designed to support AWS Firehose Logs integration with C
 Provision a firehose delivery stream for streaming logs to [Coralogix](https://coralogix.com/docs/aws-firehose/) - add this parameters to the configuration of the integration to enable to stream logs:
 
 ```terraform
-module "cloudwatch_firehose_coralogix" {
-  source                         = "github.com/coralogix/terraform-coralogix-aws//modules/firehose-logs"
+module "cloudwatch_firehose_logs_coralogix" {
+  source                         = "coralogix/aws/coralogix//modules/firehose-logs"
   firehose_stream                = var.coralogix_firehose_stream_name
   private_key                    = var.private_key
   coralogix_region               = var.coralogix_region
diff --git a/modules/firehose-metrics/README.md b/modules/firehose-metrics/README.md
index 5743db73..b75815a1 100644
--- a/modules/firehose-metrics/README.md
+++ b/modules/firehose-metrics/README.md
@@ -8,8 +8,8 @@ Firehose Metrics module is designed to support AWS Firehose Metrics integration
 Provision a firehose delivery stream with [CloudWatch metric stream](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Metric-Streams.html) to stream metrics to [Coralogix](https://coralogix.com/docs/amazon-kinesis-data-firehose-metrics/).
 
 ```terraform
-module "cloudwatch_firehose_coralogix" {
-  source           = "github.com/coralogix/terraform-coralogix-aws//modules/firehose-metrics"
+module "cloudwatch_firehose_metrics_coralogix" {
+  source           = "coralogix/aws/coralogix//modules/firehose-metrics"
   firehose_stream  = var.coralogix_firehose_stream_name
   private_key      = var.private_key
   coralogix_region = var.coralogix_region
@@ -26,8 +26,8 @@ When including specific namespaces, the variable 'include_metric_stream_namespac
 which are case-sensitive. please see the [AWS namespaces list](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/aws-services-cloudwatch-metrics.html). 
 
 ```terraform
-module "cloudwatch_firehose_coralogix" {
-  source                           = "github.com/coralogix/terraform-coralogix-aws//modules/firehose"
+module "cloudwatch_firehose_metrics_coralogix" {
+  source                           = "coralogix/aws/coralogix//modules/firehose-metrics"
   firehose_stream                  = var.coralogix_firehose_stream_name
   private_key                      = var.private_key
   include_metric_stream_namespaces = var.include_metric_stream_namespaces
@@ -46,8 +46,8 @@ The variable `include_metric_stream_filter` can be used to send only conditional
 Metric namespaces are also case-sensitive, please see the [AWS namespaces list](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/aws-services-cloudwatch-metrics.html). For case-sensitive metric names belonging to a namespace, please see the [AWS View available metrics guide](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/viewing_metrics_with_cloudwatch.html)
 
 ```terraform
-module "cloudwatch_firehose_coralogix" {
-  source                           = "github.com/coralogix/terraform-coralogix-aws//modules/firehose"
+module "cloudwatch_firehose_metrics_coralogix" {
+  source                           = "coralogix/aws/coralogix//modules/firehose-metrics"
   firehose_stream                  = var.coralogix_firehose_stream_name
   private_key                      = var.private_key
   
@@ -122,8 +122,8 @@ additional_metric_statistics = [
 By default, a [Coralogix Lambda Transformation Function](https://github.com/coralogix/cloudwatch-metric-streams-lambda-transformation) has been added to the [Kinesis Firehose Data Transformation](https://docs.aws.amazon.com/firehose/latest/dev/data-transformation.html) as a `processing_configuration`. This is done, to enrich the metrics from CloudWatch Metric Streams with AWS resource tags. The optional lambda function is deployed as part of the module, and can be removed by setting the variable `lambda_processor_enable` to `false`.
 
 ```terraform
-module "cloudwatch_firehose_coralogix" {
-  source                           = "github.com/coralogix/terraform-coralogix-aws//modules/firehose"
+module "cloudwatch_firehose_metrics_coralogix" {
+  source                           = "coralogix/aws/coralogix//modules/firehose-metrics"
   lambda_processor_enable          = false
   firehose_stream                  = var.coralogix_firehose_stream_name
   private_key                      = var.private_key