diff --git a/packages/swift-platform-sdk/Sources/BLAuthClient.swift b/packages/swift-platform-sdk/Sources/BLAuthClient.swift
index 316f0b1b..6bb27712 100644
--- a/packages/swift-platform-sdk/Sources/BLAuthClient.swift
+++ b/packages/swift-platform-sdk/Sources/BLAuthClient.swift
@@ -86,11 +86,11 @@ public final class BLAuthClient {
     // MARK: - Token Access
 
     public var accessToken: String? {
-        BLKeychain.read(service: keychainService, key: "\(config.productId)_access_token")
+        BLKeychain.read(service: keychainService, key: "access_token")
     }
 
     public var refreshTokenValue: String? {
-        BLKeychain.read(service: keychainService, key: "\(config.productId)_refresh_token")
+        BLKeychain.read(service: keychainService, key: "refresh_token")
     }
 
     public var isAuthenticated: Bool {
@@ -229,15 +229,15 @@ public final class BLAuthClient {
     // MARK: - Private
 
     private func saveTokens(access: String, refresh: String) {
-        BLKeychain.save(service: keychainService, key: "\(config.productId)_access_token", value: access)
-        BLKeychain.save(service: keychainService, key: "\(config.productId)_refresh_token", value: refresh)
+        BLKeychain.save(service: keychainService, key: "access_token", value: access)
+        BLKeychain.save(service: keychainService, key: "refresh_token", value: refresh)
         client.authToken = access
         onTokensUpdated?(access)
     }
 
     private func clearTokens() {
-        BLKeychain.delete(service: keychainService, key: "\(config.productId)_access_token")
-        BLKeychain.delete(service: keychainService, key: "\(config.productId)_refresh_token")
+        BLKeychain.delete(service: keychainService, key: "access_token")
+        BLKeychain.delete(service: keychainService, key: "refresh_token")
         client.authToken = nil
         onTokensUpdated?(nil)
     }