diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
index 759357f8..05f0a272 100644
--- a/.github/workflows/pre-merge.yml
+++ b/.github/workflows/pre-merge.yml
@@ -13,18 +13,71 @@ on:
   workflow_dispatch: 
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout PR
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+
+    - name: "Setup"
+      uses: open-edge-platform/orch-ci/.github/actions/bootstrap@main
+      with:
+        gh_token: ${{ secrets.SYS_ORCH_GITHUB }}
+        bootstrap_tools: "go,gotools,nodejs"
+
+    - name: Lint code
+      run: make lint
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout PR
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+
+    - name: "Setup"
+      uses: open-edge-platform/orch-ci/.github/actions/bootstrap@main
+      with:
+        gh_token: ${{ secrets.SYS_ORCH_GITHUB }}
+        bootstrap_tools: "go,gotools"
+
+    - name: Build code
+      run: make build
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout PR
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+
+    - name: "Setup"
+      uses: open-edge-platform/orch-ci/.github/actions/bootstrap@main
+      with:
+        gh_token: ${{ secrets.SYS_ORCH_GITHUB }}
+        bootstrap_tools: "go,gotools" 
+
+    - name: Test code
+      run: make test
+  
   pre-merge:
+    needs: [lint, build, test]
     uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@main
     with:
+      bootstrap_tools: "base,go"
+      cache_go: true
+      remove_cache_go: true
       run_security_scans: true
       run_version_check: true
       run_dep_version_check: true
-      cache_go: true
-      run_build: true
-      run_lint: true
-      run_test: true
+      run_build: false
+      run_lint: false
+      run_test: false
       run_validate_clean_folder: false
-      remove_cache_go: true
       run_docker_build: true
       run_scan_containers: false
-    secrets: inherit
+    secrets: inherit
\ No newline at end of file