diff --git a/VERSION b/VERSION
index ed941c2..47b798c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.12-dev131
+0.1.12-dev132
diff --git a/cmd/openonu-adapter/main.go b/cmd/openonu-adapter/main.go
index fa6d214..59e9a0e 100644
--- a/cmd/openonu-adapter/main.go
+++ b/cmd/openonu-adapter/main.go
@@ -123,8 +123,8 @@
 	// Create the core proxy to handle requests to the Core
 	a.coreProxy = com.NewCoreProxy(a.kip, a.config.Topic, a.config.CoreTopic)
 
-	// Create the adaptor proxy to handle request between olt and onu
-	a.adapterProxy = com.NewAdapterProxy(a.kip, "openolt", a.config.CoreTopic, cm.Backend)
+	logger.Debugw("create adapter proxy", log.Fields{"OltTopic": a.config.OltTopic, "CoreTopic": a.config.CoreTopic})
+	a.adapterProxy = com.NewAdapterProxy(a.kip, a.config.OltTopic, a.config.CoreTopic, cm.Backend)
 
 	// Create the event proxy to post events to KAFKA
 	a.eventProxy = com.NewEventProxy(com.MsgClient(a.kafkaClient), com.MsgTopic(kafka.Topic{Name: a.config.EventTopic}))
diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go
index 7d6c4e4..5bec526 100644
--- a/internal/pkg/config/config.go
+++ b/internal/pkg/config/config.go
@@ -41,8 +41,9 @@
 	defaultDisplayVersionOnly   = false
 	defaultAccIncrEvto          = false
 	defaultTopic                = "openonu"
-	defaultCoretopic            = "rwcore"
-	defaultEventtopic           = "voltha.events"
+	defaultOltTopic             = "openolt"
+	defaultCoreTopic            = "rwcore"
+	defaultEventTopic           = "voltha.events"
 	defaultOnunumber            = 1
 	defaultProbeHost            = ""
 	defaultProbePort            = 8080
@@ -72,6 +73,7 @@
 	KVStoreHost                 string
 	KVStorePort                 int
 	Topic                       string
+	OltTopic                    string
 	CoreTopic                   string
 	EventTopic                  string
 	LogLevel                    string
@@ -104,8 +106,9 @@
 		KVStoreHost:                 defaultKvstorehost,
 		KVStorePort:                 defaultKvstoreport,
 		Topic:                       defaultTopic,
-		CoreTopic:                   defaultCoretopic,
-		EventTopic:                  defaultEventtopic,
+		OltTopic:                    defaultOltTopic,
+		CoreTopic:                   defaultCoreTopic,
+		EventTopic:                  defaultEventTopic,
 		LogLevel:                    defaultLoglevel,
 		OnuNumber:                   defaultOnunumber,
 		Banner:                      defaultBanner,
@@ -143,11 +146,14 @@
 	help = fmt.Sprintf("Open ONU topic")
 	flag.StringVar(&(so.Topic), "adapter_topic", defaultTopic, help)
 
+	help = fmt.Sprintf("Open OLT topic")
+	flag.StringVar(&(so.OltTopic), "olt_adapter_topic", defaultOltTopic, help)
+
 	help = fmt.Sprintf("Core topic")
-	flag.StringVar(&(so.CoreTopic), "core_topic", defaultCoretopic, help)
+	flag.StringVar(&(so.CoreTopic), "core_topic", defaultCoreTopic, help)
 
 	help = fmt.Sprintf("Event topic")
-	flag.StringVar(&(so.EventTopic), "event_topic", defaultEventtopic, help)
+	flag.StringVar(&(so.EventTopic), "event_topic", defaultEventTopic, help)
 
 	help = fmt.Sprintf("KV store type")
 	flag.StringVar(&(so.KVStoreType), "kv_store_type", defaultKvstoretype, help)