diff --git a/prod-aws/kafka-shared/customer-billing/__env.tf b/prod-aws/kafka-shared/customer-billing/__env.tf
new file mode 120000
index 00000000..3c451396
--- /dev/null
+++ b/prod-aws/kafka-shared/customer-billing/__env.tf
@@ -0,0 +1 @@
+../__env.tf
\ No newline at end of file
diff --git a/prod-aws/kafka-shared/customer-billing.tf b/prod-aws/kafka-shared/customer-billing/customer-billing.tf
similarity index 90%
rename from prod-aws/kafka-shared/customer-billing.tf
rename to prod-aws/kafka-shared/customer-billing/customer-billing.tf
index 9edd7aab..9aa1321e 100644
--- a/prod-aws/kafka-shared/customer-billing.tf
+++ b/prod-aws/kafka-shared/customer-billing/customer-billing.tf
@@ -27,19 +27,19 @@ resource "kafka_topic" "invoice_fulfillment_deadletter" {
 }
 
 module "invoice_fulfillment" {
-  source           = "../../modules/tls-app"
+  source           = "../../../modules/tls-app"
   cert_common_name = "customer-billing/invoice-fulfillment"
   produce_topics   = [kafka_topic.invoice_fulfillment.name, kafka_topic.invoice_fulfillment_deadletter.name]
 }
 
 module "bills_total_api" {
-  source           = "../../modules/tls-app"
+  source           = "../../../modules/tls-app"
   cert_common_name = "customer-billing/bills-total-api"
   consume_topics   = { (kafka_topic.invoice_fulfillment.name) : "bex.bills-total-api-reader" }
 }
 
 module "billing_fulfilment_public_events_translator" {
-  source           = "../../modules/tls-app"
+  source           = "../../../modules/tls-app"
   cert_common_name = "customer-billing/billing-fulfilment-public-events-translator"
   consume_topics   = { (kafka_topic.invoice_fulfillment.name) : "bex.billing-fulfilment-public-events-translator" }
 }