diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f84d35e1..1c43b4d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,10 @@ jobs:
             runtime: iOS 17.5
             os: macos-14
             xcode: 15.4
+          - platform: [iOS, 18]
+            runtime: iOS 18.0
+            os: macos-14
+            xcode: 16.0
 
           - platform: [tvOS, 13]
             runtime: tvOS 13.4
@@ -92,6 +96,10 @@ jobs:
             runtime: tvOS 17.5
             os: macos-14
             xcode: 15.4
+          - platform: [tvOS, 18]
+            runtime: tvOS 18.0
+            os: macos-14
+            xcode: 16.0
 
           - platform: [watchOS, 8]
             runtime: watchOS 8.5
@@ -106,6 +114,10 @@ jobs:
             runtime: watchOS 10.5
             os: macos-14
             xcode: 15.4
+          - platform: [watchOS, 11]
+            runtime: watchOS 11.0
+            os: macos-14
+            xcode: 16.0
 
           - platform: [macOS, 12]
             runtime: macOS 12
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1b6032e0..776dd8f6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -7,6 +7,7 @@ devices = {
         15 => ["iPhone SE (3rd generation) (15.5)", "iPad Air (5th generation) (15.5)",],
         16 => ["iPhone 14 (16.4)", "iPad Pro (11-inch) (4th generation) (16.4)"],
         17 => ["iPhone 14 (17.5)", "iPad Pro (11-inch) (4th generation) (17.5)"],
+        18 => ["iPhone 15 (18.0)", "iPad Pro 11-inch (M4) (18.0)"],
     },
     "tvos" => {
         13 => ["Apple TV (13.4)"],
@@ -14,11 +15,13 @@ devices = {
         15 => ["Apple TV (15.4)"],
         16 => ["Apple TV (16.4)"],
         17 => ["Apple TV (17.5)"],
+        18 => ["Apple TV (18.0)"],
     },
     "watchos" => {
         8 => ["Apple Watch Series 7 (45mm) (8.5)"],
         9 => ["Apple Watch Series 8 (45mm) (9.4)"],
         10 => ["Apple Watch Series 9 (45mm) (10.5)"],
+        11 => ["Apple Watch Series 9 (45mm) (11.0)"],
     },
     "visionos" => {
         1 => ["Apple Vision Pro (1.2)"],