From e4ba3d6a2aa91811b039bb7097c65f46167625aa Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Wed, 1 Apr 2026 10:47:59 -0400
Subject: [PATCH 1/2] pr/workflow changes

---
 .github/pull_request_template.md | 28 ++++++++++++++++++++++++++++
 .github/workflows/contrib.yml    | 24 ------------------------
 CONTRIBUTING.md                  |  2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 .github/pull_request_template.md
 delete mode 100644 .github/workflows/contrib.yml

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..777316070
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,28 @@
+## Description
+
+<!-- 
+Provide a description for your pull request. Note any breaking changes.
+-->
+
+## Testing
+
+<!-- 
+Describe the testing you performed for this pull request.
+-->
+
+## Related Issues
+
+<!-- 
+List any related issues that this pull request addresses.
+-->
+
+## Checklist
+
+- [ ] I have read and followed the [CONTRIBUTING.md](https://github.com/Security-Onion-Solutions/securityonion/blob/3/main/CONTRIBUTING.md) file.
+- [ ] I have read and agree to the terms of the [Contributor License Agreement](https://securityonionsolutions.com/cla)
+
+## Questions or Comments
+
+<!--
+If you have any questions or comments about this pull request, please add them here.
+-->
\ No newline at end of file
diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
deleted file mode 100644
index 2cbdb2788..000000000
--- a/.github/workflows/contrib.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: contrib
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened,closed,synchronize]
-
-jobs:
-  CLAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Contributor Check"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@v2.3.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          path-to-signatures: 'signatures_v1.json'
-          path-to-document: 'https://securityonionsolutions.com/cla' 
-          allowlist: dependabot[bot],jertel,dougburks,TOoSmOotH,defensivedepth,m0duspwnens
-          remote-organization-name: Security-Onion-Solutions
-          remote-repository-name: licensing
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e5b17efe1..219600fa2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@
 
 * Link the PR to the related issue, either using [keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the PR description, or [manually](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-issues/linking-a-pull-request-to-an-issue#manually-linking-a-pull-request-to-an-issue).
 
-* **Pull requests should be opened against the `dev` branch of this repo**, and should clearly describe the problem and solution.
+* **Pull requests should be opened against the current `?/dev` branch of this repo**, and should clearly describe the problem and solution.
 
 * Be sure you have tested your changes and are confident they will not break other parts of the product.
 

From 80540da52f4c5e1f7b8ee5ee1f5fdde2994e0f93 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Wed, 1 Apr 2026 10:48:47 -0400
Subject: [PATCH 2/2] pr/workflow changes

---
 .github/pull_request_template.md | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 777316070..623998fd3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,19 +1,13 @@
 ## Description
 
 <!-- 
-Provide a description for your pull request. Note any breaking changes.
--->
-
-## Testing
-
-<!-- 
-Describe the testing you performed for this pull request.
+Explain the purpose of the pull request. Be brief or detailed depending on the scope of the changes.
 -->
 
 ## Related Issues
 
 <!-- 
-List any related issues that this pull request addresses.
+Optionally, list any related issues that this pull request addresses.
 -->
 
 ## Checklist
@@ -24,5 +18,5 @@ List any related issues that this pull request addresses.
 ## Questions or Comments
 
 <!--
-If you have any questions or comments about this pull request, please add them here.
+If you have any questions or comments about this pull request, add them here.
 -->
\ No newline at end of file