diff --git a/.github/workflows/copyright-license-checker-action.yml b/.github/workflows/copyright-license-checker-action.yml
deleted file mode 100644
index 49bfa9c3..00000000
--- a/.github/workflows/copyright-license-checker-action.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Run Copyright and License Check
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-jobs:
-  copyright-license-detector:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout PR head
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Full history so we can diff properly
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
- 
-      - name: Add PR base repo as remote and fetch it
-        run: |
-          git remote add upstream https://github.com/${{ github.event.pull_request.base.repo.full_name }}.git
-          git fetch upstream
- 
-      - name: Generate final patch between base and head
-        run: |
-          git diff upstream/${{ github.event.pull_request.base.ref }} > pr.patch
-          head -n 100 pr.patch
-
-      - name: Run copyright/license detector
-        uses: qualcomm/copyright-license-checker-action@main
-        with:
-          patch_file: pr.patch
-          repo_name: ${{ github.repository }}
diff --git a/.github/workflows/preflight-checker-workflow.yml b/.github/workflows/preflight-checker-workflow.yml
index 7c3460c6..ce507f0a 100644
--- a/.github/workflows/preflight-checker-workflow.yml
+++ b/.github/workflows/preflight-checker-workflow.yml
@@ -11,7 +11,7 @@ jobs:
     uses: qualcomm-linux/qli-actions/.github/workflows/multi-checker.yml@main
     with:
         repolinter: true # default: true
-        semgrep: true # default: true
+        semgrep: false # default: true
         copyright-license-detector: true # default: true
         pr-check-emails: true # default: true
 
diff --git a/.github/workflows/qualcomm-organization-repolinter.yml b/.github/workflows/qualcomm-organization-repolinter.yml
deleted file mode 100644
index a3103057..00000000
--- a/.github/workflows/qualcomm-organization-repolinter.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Qualcomm Organization Repolinter
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-  workflow_dispatch:
-
-jobs:
-  repolinter:
-    if: github.repository == 'qualcomm-linux/qcom-linux-testkit'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      - name: Verify repolinter config file is present
-        id: check_files
-        uses: andstor/file-existence-action@v3
-        with:
-          files: "repolint.json"
-      - name: Run Repolinter with local repolint.json
-        if: steps.check_files.outputs.files_exists == 'true'
-        uses: todogroup/repolinter-action@v1
-        with:
-          config_file: "repolint.json"
-      - name: Run Repolinter with default ruleset
-        if: steps.check_files.outputs.files_exists == 'false'
-        uses: todogroup/repolinter-action@v1
-        with:
-          config_url: "https://raw.githubusercontent.com/qualcomm/.github/main/repolint.json"
diff --git a/Runner/plans/KernelCI_PreMerge.yaml b/Runner/plans/qcom-next-ci-premerge.yaml
similarity index 100%
rename from Runner/plans/KernelCI_PreMerge.yaml
rename to Runner/plans/qcom-next-ci-premerge.yaml