diff --git a/README.md b/README.md
index 4b4617a..24fb803 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@
 Terraform module which creates resources to integrate AWS with New Relic by using Kinesis Firehose streams. Supports
 VPC Flow logs. Comes with the following sub modules:
 
-[Fargate PHP Daemon](./modules/fargate\_php\_daemon/README.md)
-[SSM License Key](./modules/ssm\_license\_key/README.md)
+* [Fargate PHP Daemon](./modules/fargate\_php\_daemon/README.md)
+* [SSM License Key](./modules/ssm\_license\_key/README.md)
 
 ## Inputs
 
@@ -75,16 +75,16 @@ No outputs.
 
 ## Resources
 
-- resource.aws_cloudwatch_metric_stream.main (main.tf#140)
-- resource.aws_flow_log.main (main.tf#289)
-- resource.aws_kinesis_firehose_delivery_stream.cloudwatch_metrics (main.tf#152)
-- resource.aws_kinesis_firehose_delivery_stream.vpc_flow_logs (main.tf#188)
-- resource.aws_s3_bucket.main (main.tf#256)
-- resource.aws_s3_bucket_acl.main (main.tf#262)
-- resource.aws_s3_bucket_public_access_block.main (main.tf#277)
-- resource.aws_s3_bucket_server_side_encryption_configuration.main (main.tf#267)
-- resource.newrelic_api_access_key.main (main.tf#306)
-- resource.newrelic_cloud_aws_link_account.main (main.tf#320)
+- resource.aws_cloudwatch_metric_stream.main (main.tf#145)
+- resource.aws_flow_log.main (main.tf#294)
+- resource.aws_kinesis_firehose_delivery_stream.cloudwatch_metrics (main.tf#157)
+- resource.aws_kinesis_firehose_delivery_stream.vpc_flow_logs (main.tf#193)
+- resource.aws_s3_bucket.main (main.tf#261)
+- resource.aws_s3_bucket_acl.main (main.tf#267)
+- resource.aws_s3_bucket_public_access_block.main (main.tf#282)
+- resource.aws_s3_bucket_server_side_encryption_configuration.main (main.tf#272)
+- resource.newrelic_api_access_key.main (main.tf#311)
+- resource.newrelic_cloud_aws_link_account.main (main.tf#325)
 - data source.aws_caller_identity.current (main.tf#10)
 
 # Examples
diff --git a/main.tf b/main.tf
index 3215168..21727c9 100644
--- a/main.tf
+++ b/main.tf
@@ -4,8 +4,8 @@
  * Terraform module which creates resources to integrate AWS with New Relic by using Kinesis Firehose streams. Supports
  * VPC Flow logs. Comes with the following sub modules:
  *
- * [Fargate PHP Daemon](./modules/fargate_php_daemon/README.md)
- * [SSM License Key](./modules/ssm_license_key/README.md)
+ * * [Fargate PHP Daemon](./modules/fargate_php_daemon/README.md)
+ * * [SSM License Key](./modules/ssm_license_key/README.md)
  */
 data "aws_caller_identity" "current" {}
 
@@ -13,7 +13,8 @@ data "aws_caller_identity" "current" {}
 # INTEGRATION ROLE
 #
 module "iam_integration_role" {
-  source = "github.com/geekcell/terraform-aws-iam-role?ref=v1"
+  source  = "geekcell/iam-role/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   name            = coalesce(var.ingeration_role_name, "${var.name}-integration")
   use_name_prefix = var.integration_role_name_prefix
@@ -41,7 +42,8 @@ module "iam_integration_role" {
 # FIREHOSE ROLE
 #
 module "iam_firehose_role" {
-  source = "github.com/geekcell/terraform-aws-iam-role?ref=v1"
+  source  = "geekcell/iam-role/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   name            = coalesce(var.firehose_role_name, "${var.name}-firehose")
   use_name_prefix = var.firehose_role_name_prefix
@@ -58,7 +60,8 @@ module "iam_firehose_role" {
 }
 
 module "iam_firehose_policy" {
-  source = "github.com/geekcell/terraform-aws-iam-policy?ref=v1"
+  source  = "geekcell/iam-policy/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   name            = "${var.name}-firehose"
   use_name_prefix = var.firehose_role_name_prefix
@@ -94,7 +97,8 @@ module "iam_firehose_policy" {
 # METRIC STREAM ROLE
 #
 module "iam_metric_stream_role" {
-  source = "github.com/geekcell/terraform-aws-iam-role?ref=v1"
+  source  = "geekcell/iam-role/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   name            = coalesce(var.metric_stream_role_name, "${var.name}-metric-stream")
   use_name_prefix = var.metric_stream_role_name_prefix
@@ -111,7 +115,8 @@ module "iam_metric_stream_role" {
 }
 
 module "iam_metric_stream_policy" {
-  source = "github.com/geekcell/terraform-aws-iam-policy?ref=v1"
+  source  = "geekcell/iam-policy/aws"
+  version = ">= 1.0.0, < 2.0.0"
 
   name            = "${var.name}-metric-stream"
   use_name_prefix = var.metric_stream_role_name_prefix