diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64cdb106..b909e5a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_12.5.1.app
+  DEVELOPER_DIR: /Applications/Xcode_13.0.app
 
 jobs:
   build:
@@ -15,18 +15,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: "NeedleFoundationTests"
-        run: xcodebuild test -project NeedleFoundation.xcodeproj -scheme NeedleFoundation -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
+        run: xcodebuild test -project NeedleFoundation.xcodeproj -scheme NeedleFoundation -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
       - name: "NeedleGeneratorTests"
         run: cd Generator && swift test -Xswiftc -DDEBUG
       - name: "NeedleGeneratorBinary"
         run: cd Generator && swift build -c release
       - name: "NeedleSampleMVCApp"
-        run: xcodebuild build -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
+        run: xcodebuild build -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
       - name: "NeedleSampleMVCTests"
-        run: xcodebuild test -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeTests -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
+        run: xcodebuild test -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeTests -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
       - name: "NeedleSamplePluginizedApp"
-        run: xcodebuild build -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
+        run: xcodebuild build -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
       - name: "NeedleSamplePluginizedScoreSheetTests"
-        run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme ScoreSheetTests -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
+        run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme ScoreSheetTests -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
       - name: "NeedleSamplePluginizedTicTacToeCoreTests"
-        run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeCoreTests -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
+        run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeCoreTests -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
diff --git a/Generator/Package.swift b/Generator/Package.swift
index 5e0e1366..233a470a 100644
--- a/Generator/Package.swift
+++ b/Generator/Package.swift
@@ -1,6 +1,14 @@
 // swift-tools-version:5.1
 import PackageDescription
 
+// Define the SwiftSyntax release to use based on the version of Swift in use
+#if swift(>=5.5) && swift(<5.6)
+// Xcode 13.0 / Swift 5.5
+let swiftSyntaxVersion: Version = "0.50500.0"
+#else
+let swiftSyntaxVersion: Version = "0.50400.0"
+#endif
+
 let package = Package(
     name: "Needle",
     products: [
@@ -11,7 +19,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-tools-support-core", .upToNextMajor(from: "0.1.5")),
         .package(url: "https://github.com/uber/swift-concurrency.git", .upToNextMajor(from: "0.6.5")),
         .package(url: "https://github.com/uber/swift-common.git", .exact("0.5.0")),
-        .package(url: "https://github.com/apple/swift-syntax.git", .exact("0.50400.0")),
+        .package(url: "https://github.com/apple/swift-syntax.git", .exact(swiftSyntaxVersion)),
     ],
     targets: [
         .target(
diff --git a/Generator/bin/lib_InternalSwiftSyntaxParser.dylib b/Generator/bin/lib_InternalSwiftSyntaxParser.dylib
index 2e0feac7..2b646904 100644
Binary files a/Generator/bin/lib_InternalSwiftSyntaxParser.dylib and b/Generator/bin/lib_InternalSwiftSyntaxParser.dylib differ
diff --git a/Generator/bin/needle b/Generator/bin/needle
index 5bdef098..1ad08648 100755
Binary files a/Generator/bin/needle and b/Generator/bin/needle differ