diff --git a/.ci/cirrus.runner.yml b/.ci/cirrus.runner.yml
index a60ff64..0fc6397 100644
--- a/.ci/cirrus.runner.yml
+++ b/.ci/cirrus.runner.yml
@@ -13,7 +13,7 @@ task:
         XCODE_COMPONENTS: "\"MetalToolchain\""
         DISK_SIZE: 400
       - MACOS_VERSION: tahoe
-        XCODE_VERSIONS: "26.1,\"26.0.1\",\"26.2-beta\""
+        XCODE_VERSIONS: "\"26.1.1\",\"26.0.1\",\"26.2-beta\""
         XCODE_COMPONENTS: "\"MetalToolchain\""
         DISK_SIZE: 280
   <<: *defaults
diff --git a/.ci/cirrus.xcode.yml b/.ci/cirrus.xcode.yml
index 3a69b3c..5c6debd 100644
--- a/.ci/cirrus.xcode.yml
+++ b/.ci/cirrus.xcode.yml
@@ -4,9 +4,12 @@ task:
   env:
     matrix:
       - MACOS_VERSION: tahoe
-        XCODE_VERSION: "26.0.1"
+        XCODE_VERSION: "26.1.1"
         XCODE_COMPONENTS: "MetalToolchain"
         LATEST: true
+      - MACOS_VERSION: tahoe
+        XCODE_VERSION: "26.0.1"
+        XCODE_COMPONENTS: "MetalToolchain"
       - MACOS_VERSION: sequoia
         XCODE_VERSION: 16.4
         LATEST: true
diff --git a/templates/xcode.pkr.hcl b/templates/xcode.pkr.hcl
index 4b56da6..2c5bf1c 100644
--- a/templates/xcode.pkr.hcl
+++ b/templates/xcode.pkr.hcl
@@ -76,9 +76,9 @@ locals {
       type = "shell"
       inline = [
         "source ~/.zprofile",
-        "sudo xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash",
+        "sudo /usr/local/bin/xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash",
         // get selected xcode path, strip /Contents/Developer and move to GitHub compatible locations
-        "INSTALLED_PATH=$(xcodes select -p)",
+        "INSTALLED_PATH=$(/usr/local/bin/xcodes select -p)",
         "CONTENTS_DIR=$(dirname $INSTALLED_PATH)",
         "APP_DIR=$(dirname $CONTENTS_DIR)",
         "sudo mv $APP_DIR /Applications/Xcode_${version}.app",
@@ -137,8 +137,12 @@ build {
   provisioner "shell" {
     inline = [
       "source ~/.zprofile",
-      "brew install xcodesorg/made/xcodes",
-      "xcodes version",
+      "wget -q https://github.com/XcodesOrg/xcodes/releases/latest/download/xcodes.zip -O xcodes.zip",
+      "unzip -q xcodes.zip",
+      "mv xcodes /usr/local/bin/",
+      "rm xcodes.zip",
+      "echo $PATH",
+      "/usr/local/bin/xcodes version",
     ]
   }
 
@@ -170,7 +174,7 @@ build {
     content {
       inline = [
         "source ~/.zprofile",
-        "sudo xcodes select '${var.xcode_version[2]}'",
+        "sudo /usr/local/bin/xcodes select '${var.xcode_version[2]}'",
         "xcodebuild -downloadAllPlatforms",
       ]
     }
@@ -182,7 +186,7 @@ build {
     content {
       inline = [
         "source ~/.zprofile",
-        "sudo xcodes select '${var.xcode_version[1]}'",
+        "sudo /usr/local/bin/xcodes select '${var.xcode_version[1]}'",
         "xcodebuild -downloadAllPlatforms",
       ]
     }
@@ -191,7 +195,7 @@ build {
   provisioner "shell" {
     inline = [
       "source ~/.zprofile",
-      "sudo xcodes select '${var.xcode_version[0]}'",
+      "sudo /usr/local/bin/xcodes select '${var.xcode_version[0]}'",
       "xcodebuild -downloadAllPlatforms",
     ]
   }