diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2604d6dc..748d0296 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,7 +51,6 @@ jobs:
           - GemStone64-3.6.0
           - GemStone64-3.6.5
           - GToolkit64-release
-        timeout-minutes: [ 15 ]
         exclude: # exclude 32bit builds on macOS and GemStone builds on windows
           - os: macos-latest
             smalltalk: Squeak32-trunk
@@ -92,13 +91,15 @@ jobs:
           bin/smalltalkci -s ${{ matrix.smalltalk }} --self-test
         shell: bash
         if: contains(matrix.smalltalk, 'trunk') == false && contains(matrix.smalltalk, 'alpha') == false && contains(matrix.smalltalk, 'Squeak32-6.0') == false && contains(matrix.smalltalk, 'GToolkit64') == false && contains(matrix.smalltalk, 'Pharo64-12') == false
-        timeout-minutes: ${{ matrix.timeout-minutes }}
+        timeout-minutes: 15
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Run smalltalkCI self test and ignore failures
         run: bin/smalltalkci -s ${{ matrix.smalltalk }} --self-test || true
         shell: bash
         if: contains(matrix.smalltalk, 'trunk') || contains(matrix.smalltalk, 'alpha') || contains(matrix.smalltalk, 'Squeak32-6.0') || contains(matrix.smalltalk, 'GToolkit64') || contains(matrix.smalltalk, 'Pharo64-12')
-        timeout-minutes: ${{ matrix.timeout-minutes }}
+        # For some reason the Squeak trunk build takes forever to complete, even thought
+        # the test run was actually successful
+        timeout-minutes: ${{ startsWith(matrix.smalltalk, 'Squeak64-trunk') && 30 || 15 }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}