diff --git a/Sources/ContainerClient/Utility.swift b/Sources/ContainerClient/Utility.swift
index 85c6c7c3..15e6f651 100644
--- a/Sources/ContainerClient/Utility.swift
+++ b/Sources/ContainerClient/Utility.swift
@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025 Apple Inc. and the container project authors.
+// Copyright © 2025-2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -73,14 +73,14 @@ public struct Utility {
     }
 
     public static func validPublishPorts(_ publishPorts: [PublishPort]) throws {
-        var hostPorts = Set<UInt16>()
+        var hostPorts = Set<String>()
         for publishPort in publishPorts {
-            for index in 0..<publishPort.count {
-                let hostPort = publishPort.hostPort + index
-                guard !hostPorts.contains(hostPort) else {
+            for index in publishPort.hostPort..<(publishPort.hostPort + publishPort.count) {
+                let hostPortKey = "\(index)/\(publishPort.proto.rawValue)"
+                guard !hostPorts.contains(hostPortKey) else {
                     throw ContainerizationError(.invalidArgument, message: "host ports for different publish port specs may not overlap")
                 }
-                hostPorts.insert(hostPort)
+                hostPorts.insert(hostPortKey)
             }
         }
     }
diff --git a/Tests/ContainerClientTests/UtilityTests.swift b/Tests/ContainerClientTests/UtilityTests.swift
index 31252502..032e4860 100644
--- a/Tests/ContainerClientTests/UtilityTests.swift
+++ b/Tests/ContainerClientTests/UtilityTests.swift
@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025 Apple Inc. and the container project authors.
+// Copyright © 2025-2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -116,4 +116,18 @@ struct UtilityTests {
         }
 
     }
+
+    @Test
+    func testPublishPortsSamePortDifferentProtocols() throws {
+        let result = try Parser.publishPorts([
+            "8080:8080/tcp",
+            "8080:8080/udp",
+            "1024-2048:1024-2048/tcp",
+            "1024-2048:1024-2048/udp",
+            "8081:8081",
+            "8081:8081/udp",
+        ])
+        #expect(result.count == 6)
+        try Utility.validPublishPorts(result)
+    }
 }