diff --git a/src/app/OperationalDeviceProxy.cpp b/src/app/OperationalDeviceProxy.cpp
index a23751c8fc84cc..0e85731a6750d6 100644
--- a/src/app/OperationalDeviceProxy.cpp
+++ b/src/app/OperationalDeviceProxy.cpp
@@ -169,8 +169,11 @@ void OperationalDeviceProxy::UpdateDeviceData(const Transport::PeerAddress & add
     char peerAddrBuff[Transport::PeerAddress::kMaxToStringSize];
     addr.ToString(peerAddrBuff);
 
-    ChipLogDetail(Controller, "Updating device address to %s while in state %d on node 0x" ChipLogFormatX64, peerAddrBuff,
-                  static_cast<int>(mState), ChipLogValueX64(GetDeviceId()));
+    ChipLogDetail(Discovery,
+                  "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64
+                  "]: Updating device address to %s while in state %d",
+                  ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()), peerAddrBuff,
+                  static_cast<int>(mState));
 #endif
 
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -367,9 +370,10 @@ OperationalDeviceProxy::~OperationalDeviceProxy()
 {
     if (mAddressLookupHandle.IsActive())
     {
-        ChipLogProgress(Discovery,
-                        "Cancelling incomplete address resolution as device is being deleted for node 0x" ChipLogFormatX64,
-                        ChipLogValueX64(GetDeviceId()));
+        ChipLogDetail(Discovery,
+                      "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64
+                      "]: Cancelling incomplete address resolution as device is being deleted.",
+                      ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()));
 
         // Skip cancel callback since the destructor is being called, so we assume that this object is
         // obviously not used anymore
@@ -395,8 +399,9 @@ CHIP_ERROR OperationalDeviceProxy::LookupPeerAddress()
     if (mAddressLookupHandle.IsActive())
     {
         ChipLogProgress(Discovery,
-                        "Operational node lookup for 0x" ChipLogFormatX64 " already in progress. Will NOT start a new one.",
-                        ChipLogValueX64(GetDeviceId()));
+                        "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64
+                        "]: Operational node lookup already in progress. Will NOT start a new one.",
+                        ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()));
         return CHIP_NO_ERROR;
     }
 
@@ -412,8 +417,10 @@ void OperationalDeviceProxy::OnNodeAddressResolved(const PeerId & peerId, const
 
 void OperationalDeviceProxy::OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason)
 {
-    ChipLogError(Discovery, "Operational discovery failed for 0x" ChipLogFormatX64 ": %" CHIP_ERROR_FORMAT,
-                 ChipLogValueX64(peerId.GetNodeId()), reason.Format());
+    ChipLogError(Discovery,
+                 "OperationalDeviceProxy[" ChipLogFormatX64 ":" ChipLogFormatX64
+                 "]: operational discovery failed: %" CHIP_ERROR_FORMAT,
+                 ChipLogValueX64(mPeerId.GetCompressedFabricId()), ChipLogValueX64(mPeerId.GetNodeId()), reason.Format());
 
     if (IsResolvingAddress())
     {