diff --git a/internal/bbsim/devices/onu.go b/internal/bbsim/devices/onu.go
index db0c747..17abfc3 100644
--- a/internal/bbsim/devices/onu.go
+++ b/internal/bbsim/devices/onu.go
@@ -20,10 +20,11 @@
 	"context"
 	"encoding/hex"
 	"fmt"
+	"sync"
+
 	"github.com/opencord/bbsim/internal/bbsim/packetHandlers"
 	"github.com/opencord/bbsim/internal/bbsim/responders/dhcp"
 	"github.com/opencord/bbsim/internal/bbsim/responders/eapol"
-	"sync"
 
 	pb "github.com/opencord/bbsim/api/bbsim"
 	"github.com/opencord/bbsim/internal/bbsim/alarmsim"
@@ -52,7 +53,6 @@
 
 const (
 	maxOmciMsgCounter = 10
-	uniPorts          = 4 // TODO this will need to be configurable
 )
 
 const (
@@ -308,8 +308,13 @@
 			},
 		},
 	)
-
-	for i := 0; i < uniPorts; i++ {
+	onuLogger.WithFields(log.Fields{
+		"OnuId":  o.ID,
+		"IntfId": o.PonPortID,
+		"OnuSn":  o.Sn(),
+		"NumUni": olt.NumUni,
+	}).Debug("creating-uni-ports")
+	for i := 0; i < olt.NumUni; i++ {
 		uni, err := NewUniPort(uint32(i), &o, nextCtag, nextStag)
 		if err != nil {
 			onuLogger.WithFields(log.Fields{