diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 0499e6f..9beed8f 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -50,6 +50,7 @@ jobs:
     with:
       codeql: true
       fastlanelane: codeql
+      xcodeversion: "16.1" # Temporary workaround for: https://github.com/actions/runner-images/issues/11335. Remove when resolved.
   pylint:
     name: PyLint
     runs-on: ubuntu-latest
diff --git a/PAWS/Account/DateOfEnrollment.swift b/PAWS/Account/DateOfEnrollment.swift
index a6fd4d9..a6c5080 100644
--- a/PAWS/Account/DateOfEnrollment.swift
+++ b/PAWS/Account/DateOfEnrollment.swift
@@ -12,11 +12,11 @@ import SpeziViews
 import SwiftUI
 
 
+// swiftlint:disable file_types_order
 private struct DisplayView: DataDisplayView {
     private let value: Date
 
-    @Environment(\.locale)
-    private var locale
+    @Environment(\.locale) private var locale
 
     private var formatStyle: Date.FormatStyle {
         .init()
@@ -60,10 +60,9 @@ extension AccountDetails {
         displayView: DisplayView.self,
         entryView: EntryView.self
     )
-    public var dateOfEnrollment: Date?
+    public var dateOfEnrollment: Date? // swiftlint:disable:this attributes
 }
 
 
 @KeyEntry(\.dateOfEnrollment)
 extension AccountKeys {}
-
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 18a7200..eac4b91 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -65,6 +65,20 @@ platform :ios do
     end
   end
 
+  desc "CodeQL"
+  lane :codeql do
+    ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "320" # CodeQL runs on GitHub CI. We need much higher timeout here.
+    build_app(
+      skip_archive: true,
+      skip_codesigning: true,
+      derived_data_path: ".derivedData",
+      xcargs: [
+        "-skipPackagePluginValidation",
+        "-skipMacroValidation"
+      ]
+    )
+  end
+
   desc "Build app"
   lane :build do
     build_app(