diff --git a/internal/pkg/onuadaptercore/alarm_manager.go b/internal/pkg/onuadaptercore/alarm_manager.go
index 6bbceb6..8fac689 100644
--- a/internal/pkg/onuadaptercore/alarm_manager.go
+++ b/internal/pkg/onuadaptercore/alarm_manager.go
@@ -703,7 +703,7 @@
 	context["onu-id"] = onuID
 	context["onu-serial-number"] = serialNo
 
-	raisedTimestamp := time.Now().UnixNano()
+	raisedTimestamp := time.Now().Unix()
 	eventDetails, err := am.getDeviceEventData(ctx, classID, alarm)
 	if err != nil {
 		logger.Warn(ctx, "event-details-for-alarm-not-found", log.Fields{"alarm-no": alarm, "class-id": classID})
diff --git a/internal/pkg/onuadaptercore/device_handler.go b/internal/pkg/onuadaptercore/device_handler.go
index ba969a1..6470a82 100644
--- a/internal/pkg/onuadaptercore/device_handler.go
+++ b/internal/pkg/onuadaptercore/device_handler.go
@@ -2144,7 +2144,7 @@
 
 	if !dh.isReconciling() {
 		logger.Infow(ctx, "UniUnlockStateDone event: Sending OnuUp event", log.Fields{"device-id": dh.deviceID})
-		raisedTs := time.Now().UnixNano()
+		raisedTs := time.Now().Unix()
 		go dh.sendOnuOperStateEvent(ctx, voltha.OperStatus_ACTIVE, dh.deviceID, raisedTs) //cmp python onu_active_event
 		pDevEntry := dh.getOnuDeviceEntry(ctx, false)
 		if pDevEntry == nil {