diff --git a/dev-aws/kafka-shared-msk/energy-budget-plan/energy-budget-plan.tf b/dev-aws/kafka-shared-msk/energy-budget-plan/energy-budget-plan.tf
index baeebff1..f16981ac 100644
--- a/dev-aws/kafka-shared-msk/energy-budget-plan/energy-budget-plan.tf
+++ b/dev-aws/kafka-shared-msk/energy-budget-plan/energy-budget-plan.tf
@@ -51,21 +51,39 @@ resource "kafka_topic" "customer_change" {
 }
 
 module "eqdb_loader_process" {
-  source           = "../../../modules/tls-app"
+  source           = "../../../modules/tls-app-v2"
   produce_topics   = [kafka_topic.eqdb_loader.name]
   cert_common_name = "energy-budget-plan/eqdb-loader"
 }
 
 module "budget_plan_fabricator" {
-  source           = "../../../modules/tls-app"
-  consume_topics   = { (kafka_topic.eqdb_loader.name) : "energy-budget-plan.eqdb-fabricator-loader-v1", (kafka_topic.customer_change.name) : "energy-budget-plan.eqdb-fabricator-customer-change-v1" }
+  source           = "../../../modules/tls-app-v2"
+  consume_topics   = [(kafka_topic.eqdb_loader.name), (kafka_topic.customer_change.name)]
+  consume_groups   = ["energy-budget-plan.eqdb-fabricator-loader-v1", "energy-budget-plan.eqdb-fabricator-customer-change-v1"]
   produce_topics   = [kafka_topic.customer_change.name]
   cert_common_name = "energy-budget-plan/eqdb-fabricator"
 }
 
+moved {
+  from = module.budget_plan_fabricator.kafka_acl.group_acl["energy-budget-plan.eqdb-loader"]
+  to   = module.budget_plan_fabricator.kafka_acl.group_acl["energy-budget-plan.eqdb-fabricator-loader-v1"]
+}
+
+moved {
+  from = module.budget_plan_fabricator.kafka_acl.group_acl["energy-budget-plan.customer-change"]
+  to   = module.budget_plan_fabricator.kafka_acl.group_acl["energy-budget-plan.eqdb-fabricator-customer-change-v1"]
+}
+
+
 module "budget_plan_calculator" {
-  source           = "../../../modules/tls-app"
-  consume_topics   = { (kafka_topic.budget_plan.name) : "energy-budget-plan.calculator-v1" }
+  source           = "../../../modules/tls-app-v2"
+  consume_topics   = [(kafka_topic.budget_plan.name)]
+  consume_groups   = ["energy-budget-plan.calculator-v1"]
   produce_topics   = [kafka_topic.budget_plan.name]
   cert_common_name = "energy-budget-plan/calculator"
 }
+
+moved {
+  from = module.budget_plan_calculator.kafka_acl.group_acl["energy-budget-plan.budget-plan"]
+  to   = module.budget_plan_calculator.kafka_acl.group_acl["energy-budget-plan.calculator-v1"]
+}