diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a7eb318..2fd55b4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,83 +1,16 @@
-name: Build images 
+name: Build images
 
 on:
-  push:
-  pull_request:
+  workflow_run:
+    workflows: ["Lint", "Tests", "E2E Tests"]
+    types:
+      - completed
 #make docker-build docker-push IMG=example/virtualhost-operator:latest
 jobs:
-  lint:
-    name: Run lint test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone the code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Run linter
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.63.4
-          args: --timeout=20m
-  test:
-    name: Run unit test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone the code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Running Tests
-        run: |
-          go mod tidy
-          make test
-  test-e2e:
-    name: Run e2e tests
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone the code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Install kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"
-          mv kubectl /usr/local/bin/
-          chmod +x /usr/local/bin/kubectl
-
-      - name: Install the latest version of kind
-        run: |
-          curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-arm64
-          chmod +x ./kind
-          sudo mv ./kind /usr/local/bin/kind
-
-      - name: Verify kind installation
-        run: kind version
-
-      - name: Remove kind cluster
-        run: kind delete cluster | true
-
-      - name: Create kind cluster
-        run: kind create cluster
-
-      - name: Running Test e2e
-        run: |
-          go mod tidy
-          make test-e2e
   build-docker:
     name: Build docker image
     runs-on: ubuntu-20.04
+
     needs: [lint, test, test-e2e]
     steps:
       - name: Clone the code
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 76e3550..bd776e3 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,8 +1,10 @@
 name: E2E Tests
 
 on:
-  push:
-  pull_request:
+  workflow_run:
+    workflows: ["Lint", "Tests"]
+    types:
+      - completed
 
 jobs:
   test-e2e: