diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 09a6b17654c..fa30cb4857f 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -18,32 +18,13 @@ on:
     branches:
       - '**'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:
-  test-linux:
-    name: Test (Linux)
-    runs-on: [self-hosted, linux, bee]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-    - name: Setup Go
-      uses: actions/setup-go@v6
-      with:
-        cache: true
-        go-version-file: go.mod
-    - name: Build
-      run: make build
-    - name: Test with race detector
-      run: make test-ci-race
-  test-other:
+  test:
     name: Test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - name: Checkout
       uses: actions/checkout@v5
@@ -52,14 +33,19 @@ jobs:
       with:
         cache: true
         go-version-file: go.mod
+    - name: Increase UDP buffer sizes (Ubuntu)
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo sysctl -w net.core.rmem_max=7500000
+        sudo sysctl -w net.core.wmem_max=7500000
     - name: Increase UDP buffer sizes (macOS)
       if: matrix.os == 'macos-latest'
       run: |
         sudo sysctl -w kern.ipc.maxsockbuf=6291456
     - name: Build
       run: make build
-    - name: Test with race detector (macOS)
-      if: matrix.os == 'macos-latest'
+    - name: Test with race detector (Ubuntu and MacOS)
+      if: matrix.os != 'windows-latest'
       run: make test-ci-race
     - name: Test without race detector (Windows)
       if: matrix.os == 'windows-latest'
@@ -124,7 +110,7 @@ jobs:
   trigger-beekeeper:
     name: Trigger Beekeeper
     runs-on: ubuntu-latest
-    needs: [test-linux, test-other, lint, coverage]
+    needs: [test, lint, coverage]
     if: github.ref == 'refs/heads/master'
     steps:
     - name: Checkout