diff --git a/dev-aws/kafka-shared-msk/payment-platform/payment.tf b/dev-aws/kafka-shared-msk/payment-platform/payment.tf
index c051efbd..d164d558 100644
--- a/dev-aws/kafka-shared-msk/payment-platform/payment.tf
+++ b/dev-aws/kafka-shared-msk/payment-platform/payment.tf
@@ -66,14 +66,6 @@ resource "kafka_topic" "payment_method_deadletter_v1_events" {
   }
 }
 
-module "payment_query_service" {
-  source           = "../../../modules/tls-app"
-  produce_topics   = [kafka_topic.payment_deadletter_v1_events.name, kafka_topic.payment_v1_events.name, kafka_topic.payment_method_deadletter_v1_events.name]
-  consume_topics   = [kafka_topic.payment_v1_events.name, kafka_topic.payment_method_v1_events.name]
-  consume_groups   = ["payment-platform.payment_query_service"]
-  cert_common_name = "payment-platform/payment-query-service"
-}
-
 # Downstream integrations
 # https://github.com/utilitywarehouse/kubernetes-manifests/blob/master/dev-merit/payment-platform/_configs/platform-integration.yaml
 resource "kafka_topic" "payment_v1_public_events_pp_test" {
@@ -163,6 +155,23 @@ module "payment_query_service_downstream" {
   cert_common_name = "payment-platform/payment-query-service-downstream"
 }
 
+module "payment_query_service" {
+  source = "../../../modules/tls-app"
+  produce_topics = [
+    kafka_topic.payment_deadletter_v1_events.name,
+    kafka_topic.payment_v1_events.name,
+    kafka_topic.payment_method_deadletter_v1_events.name,
+    kafka_topic.payment_v1_public_events_pp_test.name,
+    kafka_topic.payment_v1_public_events.name,
+    kafka_topic.payment_method_v1_public_events.name,
+    # integration topics have to go there
+    kafka_topic.payment_v1_public_events_cbc_topup_v3.name
+  ]
+  consume_topics   = [kafka_topic.payment_v1_events.name, kafka_topic.payment_method_v1_events.name]
+  consume_groups   = ["payment-platform.payment_query_service"]
+  cert_common_name = "payment-platform/payment-query-service"
+}
+
 module "payment_query_service_downstream_preview" {
   source = "../../../modules/tls-app"
   consume_topics = [