diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 644ce04..2d03620 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,25 @@ env:
   OPAL_RPC_CREDENTIALS: ${{ secrets.OPAL_RPC_CREDENTIALS }}
 
 jobs:
-  test-matrix:
+  bazel-builder:
+    runs-on:
+      - self-hosted
+      - os=linux
+      - arch=x64
+      - os_distribution=debian
+      - os_version=12
+      - revision=d04e89854b3931f4aaced77aa3a2fcad5834b3a6
+    timeout-minutes: 10
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: run all tests
+        run: |
+          # TODO(CUS-345): Enable remote execution
+          bazel test --config=noninteractive //...
+
+  golang-builder:
     runs-on:
       - self-hosted
       - "os=${{ matrix.os }}"
@@ -50,7 +68,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test with Bazel
+      - name: build all
         run: |
           # TODO(CUS-345): Enable remote execution
-          bazel test --config=noninteractive //...
+          bazel run --config=noninteractive @rules_go//go -- build ./...
+
+      - name: run all tests
+        run: |
+          # TODO(CUS-345): Enable remote execution
+          bazel run --config=noninteractive @rules_go//go -- test ./...
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 4fb672b..3131cd5 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -18,7 +18,25 @@ env:
   OPAL_RPC_CREDENTIALS: ${{ secrets.OPAL_RPC_CREDENTIALS }}
 
 jobs:
-  test-matrix:
+  bazel-builder:
+    runs-on:
+      - self-hosted
+      - os=linux
+      - arch=x64
+      - os_distribution=debian
+      - os_version=12
+      - revision=d04e89854b3931f4aaced77aa3a2fcad5834b3a6
+    timeout-minutes: 10
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: run all tests
+        run: |
+          # TODO(CUS-345): Enable remote execution
+          bazel test --config=noninteractive //...
+
+  golang-builder:
     runs-on:
       - self-hosted
       - "os=${{ matrix.os }}"
@@ -52,7 +70,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test with Bazel
+      - name: build all
         run: |
           # TODO(CUS-345): Enable remote execution
-          bazel test --config=noninteractive //...
+          bazel run --config=noninteractive @rules_go//go -- build ./...
+
+      - name: run all tests
+        run: |
+          # TODO(CUS-345): Enable remote execution
+          bazel run --config=noninteractive @rules_go//go -- test ./...