diff --git a/.github/workflows/Check_Broken_VIs.yml b/.github/workflows/Check_Broken_VIs.yml
deleted file mode 100644
index 7f849cf..0000000
--- a/.github/workflows/Check_Broken_VIs.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Check_Broken_VIs
-
-# Controls when the workflow will run
-on:
-  # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '**.drawio'
-      - '**.vipb'
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  Check_Broken_VIs:
-    # The type of runner that the job will run on
-    runs-on: [self-hosted, lv2017]
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-
-      # Runs a set of commands using the runners shell
-      - id: Check_Broken_VIs
-        uses: LV-APT/lvCICD@main
-        with:
-          LabVIEW_Version: 2017
-          Operation: VIAn_CheckBrokenVIs
-          Parameter1: ${{ github.workspace }}
-          Parameter2: NOPASSWORD
-          Parameter3: YES
-          Parameter4: -placeContent
diff --git a/.github/workflows/Build_VIPM_Library.yml b/.github/workflows/labview-ci.yml
similarity index 70%
rename from .github/workflows/Build_VIPM_Library.yml
rename to .github/workflows/labview-ci.yml
index 89860e9..8b2ed24 100644
--- a/.github/workflows/Build_VIPM_Library.yml
+++ b/.github/workflows/labview-ci.yml
@@ -1,10 +1,11 @@
-# This is a basic workflow to help you get started with Actions
+# Merged LabVIEW CI workflow
+# Combines Build_VIPM_Library.yml and Check_Broken_VIs.yml into one pipeline:
+#   Check_Broken_VIs -> Build_VIPM_Library
+# All steps run sequentially on the SAME (self-hosted) machine with a SINGLE checkout.
 
-name: Build_VIPM_Library
+name: LabVIEW CI
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
   pull_request:
     branches:
       - main
@@ -14,19 +15,13 @@ on:
     paths-ignore:
       - '**.md'
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  Build_VIPM_Library:
-    # The type of runner that the job will run on
+  labview_ci:
     runs-on: [self-hosted, lv2017]
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-
       # Get env variables
       # https://github.com/marketplace/actions/github-environment-variables-action
       - uses: FranzDiebold/github-env-vars-action@v2.8.0
@@ -34,7 +29,18 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
 
-      # Runs a set of commands using the runners shell
+      # --- Step 1: Check for broken VIs ---
+      - id: Check_Broken_VIs
+        uses: LV-APT/lvCICD@main
+        with:
+          LabVIEW_Version: 2017
+          Operation: VIAn_CheckBrokenVIs
+          Parameter1: ${{ github.workspace }}
+          Parameter2: NOPASSWORD
+          Parameter3: YES
+          Parameter4: -placeContent
+
+      # --- Step 2: Build the VIPM library ---
       - name: BuildDailyVIP
         id: build-vip
         uses: NEVSTOP-LAB/vipm-BuildViPackage@main
@@ -63,4 +69,4 @@ jobs:
           password: ${{ secrets.VIPM_FTP_PASSWORD }}
           secure: false
           server_dir: /${{ env.CI_REPOSITORY_OWNER_SLUG }}/${{ env.CI_REPOSITORY_NAME }}/${{ env.CI_ACTION_REF_NAME }}/
-          local_dir: ./vip/
+          local_dir: ./vip/
\ No newline at end of file