diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml
index fab7fe6b49..acab6d725e 100644
--- a/.github/workflows/__swift-autobuild.yml
+++ b/.github/workflows/__swift-autobuild.yml
@@ -61,6 +61,7 @@ jobs:
         id: init
         with:
           languages: swift
+          build-mode: autobuild
           tools: ${{ steps.prepare-test.outputs.tools-url }}
       - uses: ./../action/.github/actions/setup-swift
         with:
@@ -69,7 +70,7 @@ jobs:
         shell: bash
         run: pwd
       - uses: ./../action/autobuild
-        timeout-minutes: 10
+        timeout-minutes: 30
       - uses: ./../action/analyze
         id: analysis
         with:
@@ -83,5 +84,4 @@ jobs:
             exit 1
           fi
     env:
-      CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' # Remove when Swift is GA.
       CODEQL_ACTION_TEST_MODE: true
diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml
index f0a0cedfae..9e3a39f347 100644
--- a/pr-checks/checks/swift-autobuild.yml
+++ b/pr-checks/checks/swift-autobuild.yml
@@ -1,16 +1,13 @@
 name: "Swift analysis using autobuild"
 description: "Tests creation of a Swift database using autobuild"
-# versions: ["latest", "cached", "nightly-latest"]
 versions: ["nightly-latest"]
-# Swift autobuilder is only supported on MacOS for private beta
 operatingSystems: ["macos"]
-env:
-  CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA.
 steps:
   - uses: ./../action/init
     id: init
     with:
       languages: swift
+      build-mode: autobuild
       tools: ${{ steps.prepare-test.outputs.tools-url }}
   - uses: ./../action/.github/actions/setup-swift
     with:
@@ -19,7 +16,7 @@ steps:
     shell: bash
     run: pwd
   - uses: ./../action/autobuild
-    timeout-minutes: 10
+    timeout-minutes: 30
   - uses: ./../action/analyze
     id: analysis
     with: