diff --git a/.github/workflows/xcode.yml b/.github/workflows/xcode.yml
index 41b32d70..63dc1d64 100644
--- a/.github/workflows/xcode.yml
+++ b/.github/workflows/xcode.yml
@@ -14,11 +14,11 @@ on:
       - develop
 
 env:
-  DESTINATION_IOS: platform=iOS Simulator,name=iPhone 16,OS=18.1
+  DESTINATION_IOS: platform=iOS Simulator,name=iPhone 16,OS=18.5
   DESTINATION_MACOS: platform=macOS,arch=x86_64
   SCHEME: NextcloudKit
-  SERVER_BRANCH: stable28
-  PHP_VERSION: 8.2
+  SERVER_BRANCH: stable30
+  PHP_VERSION: 8.3
 
 jobs:
   build-and-test:
@@ -60,32 +60,12 @@ jobs:
         ./server/occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
         ./server/occ background:cron
         PHP_CLI_SERVER_WORKERS=5 php -S localhost:8080 -t server/ &
-#    - name: Setup Bundler and Install Gems
-#      run: |
-#        gem install bundler
-#        bundle install
-#        bundle update
-#    - name: Install docker
-#      run: |
-#        # Workaround for https://github.com/actions/runner-images/issues/8104
-#        brew remove --ignore-dependencies qemu
-#        curl -o ./qemu.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/dc0669eca9479e9eeb495397ba3a7480aaa45c2e/Formula/qemu.rb
-#        brew install ./qemu.rb
-#
-#        brew install docker
-#        colima start
-#    - name: Create docker test server and export enviroment variables
-#      run: |
-#        source ./create-docker-test-server.sh
-#        if [ ! -f ".env-vars" ]; then
-#            touch .env-vars
-#            echo "export TEST_SERVER_URL=$TEST_SERVER_URL" >> .env-vars
-#            echo "export TEST_USER=$TEST_USER" >> .env-vars
-#            echo "export TEST_APP_PASSWORD=$TEST_APP_PASSWORD" >> .env-vars
-#        fi
-#    - name: Generate EnvVars file
-#      run: |
-#        ./generate-env-vars.sh
+
+    - name: Setup Xcode
+      uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
+
     - name: Build & Test NextcloudKit
       run: |
         set -o pipefail && xcodebuild test -scheme "$SCHEME" \
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 9d2f297c..492e1bbc 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -11,7 +11,7 @@ empty_count:
 
 line_length:
   warning: 400
-  error: 400
+  error: 450
 
 function_body_length:
    warning: 200
diff --git a/Sourcery/EnvVars.stencil b/Sourcery/EnvVars.stencil
deleted file mode 100644
index 80348c8c..00000000
--- a/Sourcery/EnvVars.stencil
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  EnvVars.stencil.swift
-//  NextcloudIntegrationTests
-//
-// SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-
-import Foundation
-
-/**
-This is generated from the .env-vars file in the root directory. If there is an environment variable here that is needed and not filled, please look into this file.
- */
- public struct EnvVars {
-  static let testUser = "{{ argument.TEST_USER }}"
-  static let testAppPassword = "{{ argument.TEST_APP_PASSWORD }}"
-  static let testServerUrl = "{{ argument.TEST_SERVER_URL }}"
-}
diff --git a/Sourcery/bin/sourcery b/Sourcery/bin/sourcery
deleted file mode 100755
index 820ba022..00000000
Binary files a/Sourcery/bin/sourcery and /dev/null differ
diff --git a/generate-env-vars.sh b/generate-env-vars.sh
deleted file mode 100755
index 5a98710f..00000000
--- a/generate-env-vars.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#This generates an env-vars file that the project uses for various tasks, mostly testing. If you want to modify the env vars, open .env-vars in the root dir.
-#It also generates a .swift file in the project that contains the env vars as swift constants for easy use. Check EnvVars.generated.swift
-#
-# SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-if [ ! -f ".env-vars" ]; then
-    touch .env-vars
-    echo "export TEST_SERVER_URL=" >> .env-vars
-    echo "export TEST_USER=" >> .env-vars
-    echo "export TEST_APP_PASSWORD=" >> .env-vars
-    #add more env vars here
-fi
-
-source .env-vars
-
-Sourcery/bin/sourcery --templates Sourcery --output Sources/NextcloudKit/Generated --sources . --args TEST_USER=$TEST_USER,TEST_APP_PASSWORD=$TEST_APP_PASSWORD,TEST_SERVER_URL=$TEST_SERVER_URL
-