diff --git a/.github/workflows/CI_OSX.yaml b/.github/workflows/CI_OSX.yaml
index 542e645..d9aab83 100644
--- a/.github/workflows/CI_OSX.yaml
+++ b/.github/workflows/CI_OSX.yaml
@@ -8,28 +8,17 @@ jobs:
 
   build:
     runs-on: macos-latest
-    env:
-      TEST_TMPDIR: "/Users/runner/.cache/bazel"
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.21
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.13
         with:
          cmake-version: '3.16.x'
 
-      - name: Setup bazelisk
-        uses: bazelbuild/setup-bazelisk@v2
-
-      - name: Mount bazel cache
-        uses: actions/cache@v3
-        with:
-         path: "/Users/runner/.cache/bazel"
-         key: bazel-osx
-
       - name: Test
         run: go test -v ./db ./substate
 
diff --git a/.github/workflows/CI_UBUNTU.yaml b/.github/workflows/CI_UBUNTU.yaml
index d3067d3..7620e91 100644
--- a/.github/workflows/CI_UBUNTU.yaml
+++ b/.github/workflows/CI_UBUNTU.yaml
@@ -14,20 +14,11 @@ jobs:
         with:
           go-version: 1.21
 
-      - name: Set up bazelisk
-        uses: bazelbuild/setup-bazelisk@v2
-
       - name: Set up cmake
         uses: jwlawson/actions-setup-cmake@v1.13
         with:
          cmake-version: '3.19.x'
 
-      - name: Mount bazel cache
-        uses: actions/cache@v3
-        with:
-         path: "~/.cache/bazel"
-         key: bazel
-
       - name: Check import formatting
         run: diff -u <(echo -n) <(find . \( -path "./carmen" -o -path "./tosca" \) -prune -o  -name '*.go' -exec goimports -l {} \;)
 
@@ -35,4 +26,4 @@ jobs:
         run: diff -u <(echo -n)  <(find . \( -path "./carmen" -o -path "./tosca" \) -prune -o  -name '*.go' -exec gofmt -d -s {} \;)
 
       - name: Test
-        run: go test -v ./...
+        run: go test -v ./db ./substate