diff --git a/caas/kubernetes/ingress/vts/MANIFEST.txt b/caas/kubernetes/ingress/vts/MANIFEST.txt
new file mode 100644
index 0000000..672cd3d
--- /dev/null
+++ b/caas/kubernetes/ingress/vts/MANIFEST.txt
@@ -0,0 +1 @@
+caas-kubernetes
diff --git a/cloud/aws/elasticache/common/MANIFEST.txt b/cloud/aws/elasticache/common/MANIFEST.txt
new file mode 100644
index 0000000..3d83252
--- /dev/null
+++ b/cloud/aws/elasticache/common/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-aws
diff --git a/cloud/aws/elasticache/memcached/MANIFEST.txt b/cloud/aws/elasticache/memcached/MANIFEST.txt
new file mode 100644
index 0000000..3d83252
--- /dev/null
+++ b/cloud/aws/elasticache/memcached/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-aws
diff --git a/cloud/aws/elasticache/redis/MANIFEST.txt b/cloud/aws/elasticache/redis/MANIFEST.txt
new file mode 100644
index 0000000..3d83252
--- /dev/null
+++ b/cloud/aws/elasticache/redis/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-aws
diff --git a/cloud/aws/rds/aurora/mysql/MANIFEST.txt b/cloud/aws/rds/aurora/mysql/MANIFEST.txt
new file mode 100644
index 0000000..3d83252
--- /dev/null
+++ b/cloud/aws/rds/aurora/mysql/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-aws
diff --git a/cloud/aws/rds/aurora/postgresql/MANIFEST.txt b/cloud/aws/rds/aurora/postgresql/MANIFEST.txt
new file mode 100644
index 0000000..3d83252
--- /dev/null
+++ b/cloud/aws/rds/aurora/postgresql/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-aws
diff --git a/cloud/aws/rds/common/MANIFEST.txt b/cloud/aws/rds/common/MANIFEST.txt
new file mode 100644
index 0000000..3d83252
--- /dev/null
+++ b/cloud/aws/rds/common/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-aws
diff --git a/cloud/azure/functions/README.md b/cloud/azure/functions/README.md
index 3a129f6..42bbeec 100644
--- a/cloud/azure/functions/README.md
+++ b/cloud/azure/functions/README.md
@@ -8,8 +8,6 @@ module "datadog-monitors-cloud-azure-functions" {
 
   environment = "${var.environment}"
   message     = "${module.datadog-message-alerting.alerting-message}"
-  
-  functions_max_scale_count = 2
 }
 
 ```
diff --git a/cloud/azure/mysql/README.md b/cloud/azure/mysql/README.md
index 3ee50d8..83caccd 100644
--- a/cloud/azure/mysql/README.md
+++ b/cloud/azure/mysql/README.md
@@ -8,8 +8,6 @@ module "datadog-monitors-cloud-azure-mysql" {
 
   environment = "${var.environment}"
   message     = "${module.datadog-message-alerting.alerting-message}"
-  
-  total_connection_limit = "${var.total_connection_limit}"
 }
 
 ```
diff --git a/cloud/gcp/cloud-sql/common/MANIFEST.txt b/cloud/gcp/cloud-sql/common/MANIFEST.txt
new file mode 100644
index 0000000..6de6b50
--- /dev/null
+++ b/cloud/gcp/cloud-sql/common/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-gcp
diff --git a/cloud/gcp/cloud-sql/mysql/MANIFEST.txt b/cloud/gcp/cloud-sql/mysql/MANIFEST.txt
new file mode 100644
index 0000000..6de6b50
--- /dev/null
+++ b/cloud/gcp/cloud-sql/mysql/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-gcp
diff --git a/cloud/gcp/gce/instance/MANIFEST.txt b/cloud/gcp/gce/instance/MANIFEST.txt
new file mode 100644
index 0000000..6de6b50
--- /dev/null
+++ b/cloud/gcp/gce/instance/MANIFEST.txt
@@ -0,0 +1 @@
+cloud-gcp
diff --git a/system/generic/README.md b/system/generic/README.md
index 8ce3010..a0234cf 100644
--- a/system/generic/README.md
+++ b/system/generic/README.md
@@ -9,7 +9,7 @@ module "datadog-monitors-system-generic" {
   environment = "${var.environment}"
   message     = "${module.datadog-message-alerting.alerting-message}"
 
-  memory_message = "${module.datadog-message-alerting.alerting-message-bh-only}"
+  memory_message = "${module.datadog-message-alerting-bh-only.alerting-message}"
 }
 
 ```