diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift
index 1a411dd589..bbd7b71913 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Combine
 import Amplify
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 protocol AppSyncRealTimeClientProtocol {
     func connect() async throws
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift
index 88d891cb97..204d9eefe6 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Combine
 import Amplify
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 /**
  AppSyncRealTimeSubscription reprensents one realtime subscription to AppSync realtime server.
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift
index 2f43414296..deff4b205a 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Combine
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 protocol AppSyncWebSocketClientProtocol: AnyObject {
     var isConnected: Bool { get async }
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift
index 671e0627c7..a7edaa3747 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Amplify
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class APIKeyAuthInterceptor {
     private let apiKey: String
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/AuthTokenInterceptor.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/AuthTokenInterceptor.swift
index 99db676356..8588b00ea3 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/AuthTokenInterceptor.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/AuthTokenInterceptor.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import Amplify
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 /// General purpose authenticatication subscriptions interceptor for providers whose only
 /// requirement is to provide an authentication token via the "Authorization" header
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift
index e8ff9cc7c2..0b010156cb 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift
@@ -10,7 +10,7 @@ import Amplify
 import AWSClientRuntime
 import ClientRuntime
 import AWSPluginsCore
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class IAMAuthInterceptor {
 
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
index 8c78cb10ca..796838f693 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
@@ -9,7 +9,7 @@ import Amplify
 import Foundation
 import AWSPluginsCore
 import Combine
-@_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner, InternalTaskAsyncThrowingSequence, InternalTaskThrowingChannel {
     public typealias Request = GraphQLOperationRequest<R>
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
index b0a1bbf325..7243b1f00b 100644
--- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
+++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
@@ -10,7 +10,7 @@ import Foundation
 import Amplify
 import Combine
 import AWSPluginsCore
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 
 protocol AppSyncRealTimeClientFactoryProtocol {
diff --git a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift
index b82da6f2d9..10844f834c 100644
--- a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift
+++ b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift
@@ -11,7 +11,7 @@ import Combine
 @testable import Amplify
 @testable import AWSAPIPlugin
 @testable import AWSPluginsCore
-@testable @_spi(WebSocket) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class AppSyncRealTimeClientTests: XCTestCase {
     let subscriptionRequest = """
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift
index 3232fb3281..69957c5879 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Combine
 import Amplify
 @testable import AWSAPIPlugin
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class AppSyncRealTimeClientTests: XCTestCase {
 
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift
index db1de6de82..a61dc9cd99 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift
@@ -9,7 +9,7 @@
 import XCTest
 import Amplify
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class APIKeyAuthInterceptorTests: XCTestCase {
 
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift
index 2e57e27579..508d867496 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Amplify
 @testable import AWSAPIPlugin
 @testable import AWSPluginsCore
-@testable @_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class CognitoAuthInterceptorTests: XCTestCase {
 
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift
index e02b61a939..277daa37d0 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift
@@ -11,7 +11,7 @@ import Amplify
 import Combine
 @testable import AWSAPIPlugin
 @testable import AWSPluginsCore
-@testable @_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 struct MockSubscriptionConnectionFactory: AppSyncRealTimeClientFactoryProtocol {
     
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLSubscriptionOperationCancelTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLSubscriptionOperationCancelTests.swift
index 95fc5b8e63..f0b9dcf390 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLSubscriptionOperationCancelTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLSubscriptionOperationCancelTests.swift
@@ -10,7 +10,7 @@ import XCTest
 @testable import Amplify
 @testable import AWSAPIPlugin
 @testable import AmplifyTestCommon
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
 @testable import AWSPluginsTestCommon
 
 // swiftlint:disable:next type_name
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift
index d8e9073096..3fe53f7099 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift
@@ -11,7 +11,7 @@ import XCTest
 import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 @_implementationOnly import AmplifyAsyncTesting
 
 class GraphQLSubscribeCombineTests: OperationTestBase {
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift
index 6c0e7b0421..446e159bd8 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift
@@ -11,7 +11,7 @@ import XCTest
 import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 @_implementationOnly import AmplifyAsyncTesting
 
 class GraphQLSubscribeTasksTests: OperationTestBase {
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift
index 98806c17e0..dee60cde4b 100644
--- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift
+++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift
@@ -9,7 +9,7 @@ import XCTest
 @testable import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class GraphQLSubscribeTests: OperationTestBase {
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/DataStoreLargeNumberModelsSubscriptionTests.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/DataStoreLargeNumberModelsSubscriptionTests.swift
index cc0fc9fbe6..d0769d45ca 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/DataStoreLargeNumberModelsSubscriptionTests.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/DataStoreLargeNumberModelsSubscriptionTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Combine
 import Amplify
 @testable import AWSAPIPlugin
-@_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class DataStoreLargeNumberModelsSubscriptionTests: SyncEngineIntegrationTestBase {
 
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/AmplifyNetworkMonitor.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/AmplifyNetworkMonitor.swift
index 23eb1ec4e2..50bc2180d5 100644
--- a/AmplifyPlugins/Internal/Sources/Network/WebSocket/AmplifyNetworkMonitor.swift
+++ b/AmplifyPlugins/Internal/Sources/Network/WebSocket/AmplifyNetworkMonitor.swift
@@ -9,7 +9,6 @@
 import Network
 import Combine
 
-@_spi(WebSocket)
 public final class AmplifyNetworkMonitor {
 
     public enum State {
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/RetryWithJitter.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/RetryWithJitter.swift
index 9da51cb03f..ff97fab87d 100644
--- a/AmplifyPlugins/Internal/Sources/Network/WebSocket/RetryWithJitter.swift
+++ b/AmplifyPlugins/Internal/Sources/Network/WebSocket/RetryWithJitter.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public actor RetryWithJitter {
     public enum Error: Swift.Error {
         case maxRetryExceeded([Swift.Error])
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketClient.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketClient.swift
index bc677744f8..513f121621 100644
--- a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketClient.swift
+++ b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketClient.swift
@@ -14,7 +14,6 @@ import Combine
  WebSocketClient wraps URLSessionWebSocketTask and offers
  an abstraction of the data stream in the form of WebSocketEvent.
  */
-@_spi(WebSocket)
 public final actor WebSocketClient: NSObject {
     public enum Error: Swift.Error {
         case connectionLost
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketEvent.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketEvent.swift
index 35c101dd6e..4035e20a3a 100644
--- a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketEvent.swift
+++ b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketEvent.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public enum WebSocketEvent {
     case connected
     case disconnected(URLSessionWebSocketTask.CloseCode, String?)
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketInterceptor.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketInterceptor.swift
index a53ec3b950..6bed62cde5 100644
--- a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketInterceptor.swift
+++ b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketInterceptor.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public protocol WebSocketInterceptor {
     func interceptConnection(url: URL) async -> URL
 }
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketNetworkMonitorProtocol.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketNetworkMonitorProtocol.swift
index 3966e7ab9d..1958228a38 100644
--- a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketNetworkMonitorProtocol.swift
+++ b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketNetworkMonitorProtocol.swift
@@ -9,7 +9,6 @@
 import Foundation
 import Combine
 
-@_spi(WebSocket)
 public protocol WebSocketNetworkMonitorProtocol {
     var publisher: AnyPublisher<(AmplifyNetworkMonitor.State, AmplifyNetworkMonitor.State), Never> { get }
     func updateState(_ nextState: AmplifyNetworkMonitor.State) async
diff --git a/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/RetryWithJitterTests.swift b/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/RetryWithJitterTests.swift
index 9ada954056..15a6aed34e 100644
--- a/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/RetryWithJitterTests.swift
+++ b/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/RetryWithJitterTests.swift
@@ -7,7 +7,7 @@
 
 
 import XCTest
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
 
 class RetryWithJitterTests: XCTestCase {
     struct TestError: Error {
diff --git a/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/WebSocketClientTests.swift b/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/WebSocketClientTests.swift
index f3e53669c1..a9dc80a155 100644
--- a/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/WebSocketClientTests.swift
+++ b/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/WebSocketClientTests.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 import Combine
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
 
 fileprivate let timeout: TimeInterval = 5