diff --git a/Sources/ContainerClient/Core/Constants.swift b/Sources/ContainerClient/Core/Constants.swift
index db321d93d..ca0710cb6 100644
--- a/Sources/ContainerClient/Core/Constants.swift
+++ b/Sources/ContainerClient/Core/Constants.swift
@@ -15,5 +15,5 @@
 //===----------------------------------------------------------------------===//
 
 public enum Constants {
-    public static let keychainID = "com.apple.container"
+    public static let keychainID = "com.apple.container.registry"
 }
diff --git a/Sources/Services/ContainerImagesService/Server/ImageService.swift b/Sources/Services/ContainerImagesService/Server/ImageService.swift
index 59e5ef779..18e5a34bb 100644
--- a/Sources/Services/ContainerImagesService/Server/ImageService.swift
+++ b/Sources/Services/ContainerImagesService/Server/ImageService.swift
@@ -26,8 +26,6 @@ import Logging
 import TerminalProgress
 
 public actor ImagesService {
-    public static let keychainID = "com.apple.container"
-
     private let log: Logger
     private let contentStore: ContentStore
     private let imageStore: ImageStore
@@ -165,7 +163,7 @@ extension ImagesService {
         if let authentication {
             return try await body(authentication)
         }
-        let keychain = KeychainHelper(id: Self.keychainID)
+        let keychain = KeychainHelper(id: Constants.keychainID)
         do {
             authentication = try keychain.lookup(domain: host)
         } catch let err as KeychainHelper.Error {