diff --git a/.github/workflows/compatibility_tests.yml b/.github/workflows/compatibility_tests.yml
index 3667e44..1a905f9 100644
--- a/.github/workflows/compatibility_tests.yml
+++ b/.github/workflows/compatibility_tests.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         include:
           - os: macos-15
-            xcode-version: "16.3"   # Swift 6.1
+            xcode-version: "16.4"   # Swift 6.1.2
     runs-on: ${{ matrix.os }}
     env:
       OPENBOX_WERROR: 1
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 0f8f540..e150a2d 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -13,10 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15]
-        xcode-version: ["16.3"]   # Swift 6.1
-        ios-version: ["18.0"]
+        xcode-version: ["16.4"]   # Swift 6.1.2
+        ios-version: ["18.5"]
         include:
-          - ios-version: "18.0"
+          - ios-version: "18.5"
             ios-simulator-name: "iPhone 16 Pro"
     runs-on: ${{ matrix.os }}
     env:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index bbf3e3d..3dbfc5c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15]
-        xcode-version: [16.3]   # Swift 6.1
+        xcode-version: [16.4]   # Swift 6.1.2
     runs-on: ${{ matrix.os }}
     env:
       OPENBOX_WERROR: 1
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 253918d..5d5a176 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ["6.1"]
+        swift_version: ["6.1.2"]
     runs-on: ubuntu-22.04
     env:
       OPENBOX_WERROR: 1
diff --git a/README.md b/README.md
index 0667ab5..23d9555 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Currently, this project is in early development.
 
 ## Build
 
-The current suggested toolchain to build the project is Swift 6.1 / Xcode 16.3.
+The current suggested toolchain to build the project is Swift 6.1.2 / Xcode 16.4.
 
 ## Supported platforms