diff --git a/build-logic/src/main/kotlin/kmp.kt b/build-logic/src/main/kotlin/kmp.kt
index dd01654ae19..a76a7714ed6 100644
--- a/build-logic/src/main/kotlin/kmp.kt
+++ b/build-logic/src/main/kotlin/kmp.kt
@@ -13,6 +13,7 @@ internal val allAppleTargets = setOf(
     "iosSimulatorArm64",
     "watchosArm32",
     "watchosArm64",
+    "watchosDeviceArm64",
     "watchosSimulatorArm64",
     "tvosArm64",
     "tvosX64",
@@ -84,6 +85,7 @@ fun defaultTargets(
           "iosSimulatorArm64" -> iosSimulatorArm64()
           "watchosArm32" -> watchosArm32()
           "watchosArm64" -> watchosArm64()
+          "watchosDeviceArm64" -> watchosDeviceArm64()
           "watchosSimulatorArm64" -> watchosSimulatorArm64()
           "tvosArm64" -> tvosArm64()
           "tvosX64" -> tvosX64()
@@ -117,6 +119,7 @@ fun defaultTargets(
  * apple --> iosSimulatorArm64
  * apple --> watchosArm32
  * apple --> watchosArm64
+ * apple --> watchosDeviceArm64
  * apple --> watchosSimulatorArm64
  * apple --> tvosArm64
  * apple --> tvosX64
diff --git a/docs/source/index.mdx b/docs/source/index.mdx
index 30cd72823f9..6aea6df260a 100644
--- a/docs/source/index.mdx
+++ b/docs/source/index.mdx
@@ -134,6 +134,7 @@ Here's the current matrix of supported features per platform:
 - `iosSimulatorArm64`
 - `watchosArm32`
 - `watchosArm64`
+- `watchosDeviceArm64`
 - `watchosSimulatorArm64`
 - `tvosArm64`
 - `tvosX64`
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
index 817188e6712..9abe6a7320f 100644
--- a/gradle/libraries.toml
+++ b/gradle/libraries.toml
@@ -64,7 +64,7 @@ androidx-startup-runtime = { group = "androidx.startup", name = "startup-runtime
 apollo-api = { group = "com.apollographql.apollo", name = "apollo-api", version.ref = "apollo" }
 apollo-api-java = { group = "com.apollographql.apollo", name = "apollo-api-java", version.ref = "apollo" }
 apollo-httpCache = { group = "com.apollographql.apollo", name = "apollo-http-cache", version.ref = "apollo" }
-apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version = "0.3.0" }
+apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version = "0.3.1" }
 apollo-mpputils = { group = "com.apollographql.apollo", name = "apollo-mpp-utils", version.ref = "apollo" }
 apollo-normalizedcache = { group = "com.apollographql.apollo", name = "apollo-normalized-cache", version.ref = "apollo" }
 apollo-normalizedcache-sqlite = { group = "com.apollographql.apollo", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
diff --git a/libraries/apollo-annotations/api/apollo-annotations.klib.api b/libraries/apollo-annotations/api/apollo-annotations.klib.api
index dabb4822633..e6f39ff61c3 100644
--- a/libraries/apollo-annotations/api/apollo-annotations.klib.api
+++ b/libraries/apollo-annotations/api/apollo-annotations.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-api/api/apollo-api.klib.api b/libraries/apollo-api/api/apollo-api.klib.api
index 084ccc834a2..9043710d1aa 100644
--- a/libraries/apollo-api/api/apollo-api.klib.api
+++ b/libraries/apollo-api/api/apollo-api.klib.api
@@ -1,7 +1,7 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
-// Alias: native => [iosArm64, iosSimulatorArm64, iosX64, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosSimulatorArm64]
-// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
+// Alias: native => [iosArm64, iosSimulatorArm64, iosX64, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
+// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-ast/api/apollo-ast.klib.api b/libraries/apollo-ast/api/apollo-ast.klib.api
index 7ca166edc20..7d28d9a94f7 100644
--- a/libraries/apollo-ast/api/apollo-ast.klib.api
+++ b/libraries/apollo-ast/api/apollo-ast.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-engine-tests/api/apollo-engine-tests.klib.api b/libraries/apollo-engine-tests/api/apollo-engine-tests.klib.api
index eb0da40451a..3a2565f2b2a 100644
--- a/libraries/apollo-engine-tests/api/apollo-engine-tests.klib.api
+++ b/libraries/apollo-engine-tests/api/apollo-engine-tests.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-execution/api/apollo-execution.klib.api b/libraries/apollo-execution/api/apollo-execution.klib.api
index 046e56c23cd..fc45c07f7a5 100644
--- a/libraries/apollo-execution/api/apollo-execution.klib.api
+++ b/libraries/apollo-execution/api/apollo-execution.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-mpp-utils/api/apollo-mpp-utils.klib.api b/libraries/apollo-mpp-utils/api/apollo-mpp-utils.klib.api
index 1e46515aac9..25a659981da 100644
--- a/libraries/apollo-mpp-utils/api/apollo-mpp-utils.klib.api
+++ b/libraries/apollo-mpp-utils/api/apollo-mpp-utils.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-normalized-cache-api/api/apollo-normalized-cache-api.klib.api b/libraries/apollo-normalized-cache-api/api/apollo-normalized-cache-api.klib.api
index c92f11ef786..3bbaa93800e 100644
--- a/libraries/apollo-normalized-cache-api/api/apollo-normalized-cache-api.klib.api
+++ b/libraries/apollo-normalized-cache-api/api/apollo-normalized-cache-api.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-normalized-cache-sqlite/api/apollo-normalized-cache-sqlite.klib.api b/libraries/apollo-normalized-cache-sqlite/api/apollo-normalized-cache-sqlite.klib.api
index e1500e4cee7..5ab7e579600 100644
--- a/libraries/apollo-normalized-cache-sqlite/api/apollo-normalized-cache-sqlite.klib.api
+++ b/libraries/apollo-normalized-cache-sqlite/api/apollo-normalized-cache-sqlite.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-normalized-cache/api/apollo-normalized-cache.klib.api b/libraries/apollo-normalized-cache/api/apollo-normalized-cache.klib.api
index 64e3aedc219..92688799dde 100644
--- a/libraries/apollo-normalized-cache/api/apollo-normalized-cache.klib.api
+++ b/libraries/apollo-normalized-cache/api/apollo-normalized-cache.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/libraries/apollo-runtime/api/apollo-runtime.klib.api b/libraries/apollo-runtime/api/apollo-runtime.klib.api
index 0d8cf7a6b13..76f56718fb4 100644
--- a/libraries/apollo-runtime/api/apollo-runtime.klib.api
+++ b/libraries/apollo-runtime/api/apollo-runtime.klib.api
@@ -1,6 +1,6 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
-// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxX64.linux, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
+// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Alias: ios => [iosArm64, iosSimulatorArm64, iosX64]
 // Alias: macos => [macosArm64, macosX64]
 // Alias: tvos => [tvosArm64, tvosSimulatorArm64, tvosX64]
@@ -822,7 +822,7 @@ abstract interface com.apollographql.apollo.network.ws/WebSocketConnectionListen
     abstract fun onError(platform.Foundation/NSError?) // com.apollographql.apollo.network.ws/WebSocketConnectionListener.onError|onError(platform.Foundation.NSError?){}[0]
     abstract fun onOpen(platform.Foundation/NSURLSessionWebSocketTask) // com.apollographql.apollo.network.ws/WebSocketConnectionListener.onOpen|onOpen(platform.Foundation.NSURLSessionWebSocketTask){}[0]
 
-    // Targets: [ios, macos, tvos, watchosSimulatorArm64]
+    // Targets: [ios, macos, tvos, watchosDeviceArm64, watchosSimulatorArm64]
     abstract fun onClose(platform.Foundation/NSURLSessionWebSocketTask, kotlin/Long) // com.apollographql.apollo.network.ws/WebSocketConnectionListener.onClose|onClose(platform.Foundation.NSURLSessionWebSocketTask;kotlin.Long){}[0]
 
     // Targets: [watchosArm32, watchosArm64]
diff --git a/libraries/apollo-testing-support/api/apollo-testing-support.klib.api b/libraries/apollo-testing-support/api/apollo-testing-support.klib.api
index 19451417b52..5a076e2e86b 100644
--- a/libraries/apollo-testing-support/api/apollo-testing-support.klib.api
+++ b/libraries/apollo-testing-support/api/apollo-testing-support.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true