diff --git a/cmd/openolt-adapter/main.go b/cmd/openolt-adapter/main.go
index 31c71d5..45cbf53 100644
--- a/cmd/openolt-adapter/main.go
+++ b/cmd/openolt-adapter/main.go
@@ -385,7 +385,7 @@
 		Version: version.VersionInfo.Version,
 		// TODO once we'll be ready to support multiple versions of the OpenOLT adapter
 		// the Endpoint will have to change to `openolt_<currentReplica`>
-		Endpoint:       "openolt",
+		Endpoint:       a.config.Topic,
 		Type:           "openolt",
 		CurrentReplica: int32(a.config.CurrentReplica),
 		TotalReplicas:  int32(a.config.TotalReplicas),