diff --git a/src/main.tf b/src/main.tf
index 62628c6..7a70f84 100644
--- a/src/main.tf
+++ b/src/main.tf
@@ -12,8 +12,8 @@ locals {
         lookup(v, "name_prefix", "/aws/"),
         module.log_group_prefix.id,
         module.log_group_prefix.delimiter,
-        lookup(v, "name_suffix")
-      ) : lookup(v, "name")
+        v["name_suffix"]
+      ) : v["name"]
       filter_pattern : lookup(v, "filter_pattern", "")
     }
   }
diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf
index 6fa8b89..c48b917 100644
--- a/src/provider-datadog.tf
+++ b/src/provider-datadog.tf
@@ -1,5 +1,5 @@
 module "datadog_configuration" {
-  source                  = "../datadog-configuration/modules/datadog_keys"
+  source                  = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=tags/v1.535.1"
   enabled                 = true
   context                 = module.this.context
   global_environment_name = var.datadog_configuration_environment