diff --git a/CHANGELOG.md b/CHANGELOG.md
index 049bc90..3967635 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,6 +118,18 @@
   - vpn
     - fix up vpn_config_output
 
+* 1.6.4 -- 2022-05-25
+  - flowlogs
+    - change template to use account_alias
+
+* 1.6.5 -- 2022-06-07
+  - all
+    - backport module name and list(), map() changes
+
+* 1.6.6 -- 2022-07-15
+  - flowlogs
+    - update template to use account-alias and vpc name
+
 ## Version 2.x
   
 * 2.0.0 -- 2022-05-09
@@ -142,3 +154,8 @@
 * 2.0.4 -- 2022-06-23
   - vpn
     - add file_label for naming of output vpn config
+
+* 2.0.5 -- 2022-07-15
+  - flowlogs
+    - update template to use account-alias and vpc name
+
diff --git a/common/version.tf b/common/version.tf
index 7d77678..159576b 100644
--- a/common/version.tf
+++ b/common/version.tf
@@ -1,5 +1,5 @@
 locals {
-  _module_version = "2.0.4"
+  _module_version = "2.0.5"
   _module_names = {
     "_main_" = "aws-vpc-setup"
 
diff --git a/flowlogs/main.tf b/flowlogs/main.tf
index abf605d..5bdbcba 100644
--- a/flowlogs/main.tf
+++ b/flowlogs/main.tf
@@ -151,6 +151,7 @@ data "template_file" "splunk_flowlog_tasks_flowlog" {
     region              = data.aws_region.current.name
     flowlog_name        = aws_cloudwatch_log_group.flowlog.name
     flowlog_stream_name = local.flowlog_stream_name
+    vpc_full_name       = var.vpc_full_name
   }
 }
 
diff --git a/flowlogs/templates/aws_kinesis_tasks.conf.tpl b/flowlogs/templates/aws_kinesis_tasks.conf.tpl
index 9a09268..9117e97 100644
--- a/flowlogs/templates/aws_kinesis_tasks.conf.tpl
+++ b/flowlogs/templates/aws_kinesis_tasks.conf.tpl
@@ -1,6 +1,5 @@
-[${account_alias}-flowlogs-${region}_${flowlog_name}]
-# account_id = ${account_id}
-account = ${account_alias}
+[${account_id}-${account_alias}-flowlogs-${region}_${vpc_full_name}]
+account = ${account_id}-${account_alias}
 format = CloudWatchLogs
 index = aws_vpc_flow_logs
 region = ${region}