diff --git a/.github/workflows/build_push_controller.yaml b/.github/workflows/build_push_controller.yaml
index 1f555e7..b313f82 100644
--- a/.github/workflows/build_push_controller.yaml
+++ b/.github/workflows/build_push_controller.yaml
@@ -3,7 +3,7 @@ name: Build and push images
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - api/**
       - cmd/**
diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml
index 0b8e099..414b015 100644
--- a/.github/workflows/unittest.yaml
+++ b/.github/workflows/unittest.yaml
@@ -33,7 +33,7 @@ jobs:
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3
         with:
-          name: code-coverage-report
+          name: operator-code-coverage-report
           path: operator-cover.html
   device-plugin-test:
     runs-on: ubuntu-latest
@@ -52,5 +52,5 @@ jobs:
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3
         with:
-          name: code-coverage-report
+          name: device-plugin-code-coverage-report
           path: dp-cover.html
\ No newline at end of file
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
index e242919..8160b5c 100644
--- a/controllers/suite_test.go
+++ b/controllers/suite_test.go
@@ -23,10 +23,10 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	efav1alpha1 "github.com/foundation-model-stack/ocp-efa-operator/api/v1alpha1"
 	kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
 	securityv1 "github.com/openshift/api/security/v1"
 	nfdv1alpha1 "github.com/openshift/node-feature-discovery/pkg/apis/nfd/v1alpha1"
-	efav1alpha1 "github.com/foundation-model-stack/ocp-efa-operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	//+kubebuilder:scaffold:imports
 )
@@ -43,7 +43,9 @@ const kmmNamespace = "openshift-kmm"
 const clusterName = "test"
 
 func TestAPIs(t *testing.T) {
-	os.Setenv("KUBEBUILDER_ASSETS", "/data/go/src/github.com/foundation-model-stack/ocp-efa-operator/bin/k8s/1.26.0-linux-amd64")
+	if os.Getenv("KUBEBUILDER_ASSETS") == "" {
+		os.Setenv("KUBEBUILDER_ASSETS", filepath.Join(build.Default.GOPATH, "src", "github.com", "foundation-model-stack", "ocp-efa-operator", "bin", "k8s", "1.26.0-linux-amd64"))
+	}
 	RegisterFailHandler(Fail)
 
 	RunSpecs(t, "Controller Suite")