diff --git a/hm-kafka/topicctl/development-hm-kafka/cluster-config.yaml b/hm-kafka/topicctl/non-production-hm-kafka/cluster-config.yaml
similarity index 100%
rename from hm-kafka/topicctl/development-hm-kafka/cluster-config.yaml
rename to hm-kafka/topicctl/non-production-hm-kafka/cluster-config.yaml
diff --git a/hm-kafka/topicctl/development-hm-kafka/topics/development.tracker.analytic-events.avro.yaml b/hm-kafka/topicctl/non-production-hm-kafka/topics/development.tracker.analytic-events.avro.yaml
similarity index 100%
rename from hm-kafka/topicctl/development-hm-kafka/topics/development.tracker.analytic-events.avro.yaml
rename to hm-kafka/topicctl/non-production-hm-kafka/topics/development.tracker.analytic-events.avro.yaml
diff --git a/hm-kafka/topicctl/development-hm-kafka/topics/staging.tracker.analytic-events.avro.yaml b/hm-kafka/topicctl/non-production-hm-kafka/topics/staging.tracker.analytic-events.avro.yaml
similarity index 100%
rename from hm-kafka/topicctl/development-hm-kafka/topics/staging.tracker.analytic-events.avro.yaml
rename to hm-kafka/topicctl/non-production-hm-kafka/topics/staging.tracker.analytic-events.avro.yaml