diff --git a/pw_bluetooth_proxy/l2cap_leu_signaling_channel.cc b/pw_bluetooth_proxy/l2cap_leu_signaling_channel.cc
index 7ed440ed3..d2fe96ab4 100644
--- a/pw_bluetooth_proxy/l2cap_leu_signaling_channel.cc
+++ b/pw_bluetooth_proxy/l2cap_leu_signaling_channel.cc
@@ -48,10 +48,11 @@ bool L2capLeUSignalingChannel::OnPduReceived(pw::span<uint8_t> cframe) {
     return false;
   }
 
-  // TODO: saeedali@ -  "If a device receives a C-frame that exceeds its
-  // L2CAP_SIG_MTU_SIZE then it shall send an L2CAP_COMMAND_REJECT_RSP packet
-  // containing the supported L2CAP_SIG_MTU_SIZE." We should consider taking
-  // the signaling MTU in the ProxyHost constructor.
+  // TODO: https://pwbug.dev/360929142 - "If a device receives a C-frame that
+  // exceeds its L2CAP_SIG_MTU_SIZE then it shall send an
+  // L2CAP_COMMAND_REJECT_RSP packet containing the supported
+  // L2CAP_SIG_MTU_SIZE." We should consider taking the signaling MTU in the
+  // ProxyHost constructor.
 
   // Core Spec v5.4 Vol 3, Part A, 4: "Examples of signaling packets that are
   // not correctly formed include... A C-frame on fixed channel 0x0005 contains
diff --git a/pw_bluetooth_proxy/proxy_host_test.cc b/pw_bluetooth_proxy/proxy_host_test.cc
index d138b5b59..fb4e08081 100644
--- a/pw_bluetooth_proxy/proxy_host_test.cc
+++ b/pw_bluetooth_proxy/proxy_host_test.cc
@@ -3685,8 +3685,8 @@ TEST(L2capSignalingTest, CreditIndAddressedToNonManagedChannelForwardedToHost) {
   EXPECT_EQ(forwards_to_host, 1);
 }
 
-// TODO: saeedali@ - Add many more tests exercising queueing + credit-based
-// control flow.
+// TODO: https://pwbug.dev/360929142 - Add many more tests exercising queueing +
+// credit-based control flow.
 
 }  // namespace
 }  // namespace pw::bluetooth::proxy
diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h
index 7d099d1e5..6ff3e0375 100644
--- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h
+++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h
@@ -18,7 +18,7 @@
 
 namespace pw::bluetooth::proxy {
 
-// TODO: saeedali@ - Also support ProxyAclWriteChannel.
+// TODO: https://pwbug.dev/360929142 - Also support L2capWriteChannel.
 class BasicL2capChannel : public L2capReadChannel {
  public:
   explicit BasicL2capChannel(
diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/acl_data_channel.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/acl_data_channel.h
index c82c0baef..7cfda664f 100644
--- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/acl_data_channel.h
+++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/acl_data_channel.h
@@ -116,8 +116,8 @@ class AclDataChannel {
 
  private:
   // An active logical link on LE ACL logical transport.
-  // TODO: saeedali@ - Encapsulate all logic related to this within a new
-  // LogicalLinkManager class?
+  // TODO: https://pwbug.dev/360929142 - Encapsulate all logic related to this
+  // within a new LogicalLinkManager class?
   class LeAclConnection {
    public:
     LeAclConnection(uint16_t connection_handle,
diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_write_channel.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_write_channel.h
index 257bb6405..6f8638b71 100644
--- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_write_channel.h
+++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_write_channel.h
@@ -37,8 +37,8 @@ class L2capWriteChannel : public IntrusiveForwardList<L2capWriteChannel>::Item {
   L2capWriteChannel(const L2capWriteChannel& other) = delete;
   L2capWriteChannel& operator=(const L2capWriteChannel& other) = delete;
   L2capWriteChannel(L2capWriteChannel&& other);
-  // TODO: saeedali@ - Define move assignment operator so write channels can be
-  // erased from containers.
+  // TODO: https://pwbug.dev/360929142 - Define move assignment operator so
+  // write channels can be erased from containers.
   L2capWriteChannel& operator=(L2capWriteChannel&& other) = delete;
 
   virtual ~L2capWriteChannel();
diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h
index 0cf945257..2d948e478 100644
--- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h
+++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h
@@ -53,8 +53,8 @@ class L2capCoc : public L2capWriteChannel, public L2capReadChannel {
   };
 
   enum class Event {
-    // TODO: saeedali@ - Listen for L2CAP_DISCONNECTION_REQ/RSP packets and
-    // report this event accordingly.
+    // TODO: https://pwbug.dev/360929142 - Listen for
+    // L2CAP_DISCONNECTION_REQ/RSP packets and report this event accordingly.
     kChannelClosedByOther,
     /// An invalid packet was received. The channel is now `kStopped` and should
     /// be closed. See error logs for details.