diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 25d80f902..18d8217ff 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -1,48 +1,31 @@
-name: Test
+name: Build and Test
+
 on:
-  pull_request:
-    branches: "*"
-    paths:
-      - '**.go'
-      - 'go.mod'
-      - 'go.sum'
   push:
-    branches:
-      - main
-      - staging
-    paths:
-      - '**.go'
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build Services
-        run: make build/canopy-full
-  test:
-    name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Set up cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Run Unit tests
-        run: make build/canopy-full && go test ./...
+    - name: Checkout Code
+      uses: actions/checkout@v4
+    
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'
+        cache: true
+
+    - name: Clean and Tidy
+      run: |
+        go mod tidy
+        go mod download
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...