diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/build-python-package.yml
similarity index 100%
rename from .github/workflows/python-package-conda.yml
rename to .github/workflows/build-python-package.yml
diff --git a/.github/workflows/cve-scanning-python.yml b/.github/workflows/cve-scanning-python.yml
index 4873cbe..ffb362d 100644
--- a/.github/workflows/cve-scanning-python.yml
+++ b/.github/workflows/cve-scanning-python.yml
@@ -1,35 +1,19 @@
 name: CVE Scanning for Python
 
 on:
-  workflow_dispatch:
   schedule:
     - cron: '0 8,18 * * 1-5'
-  push:
-    paths:
-      - 'pyproject.toml'
-      - 'safety-policy.yml'
-      - '.github/workflows/cve-scanning-python.yml'
-
-env:
-  PYTHON_KEYRING_BACKEND: keyring.backends.null.Keyring
+  push:  # Run on every push to any branch
+  pull_request:  # Run on new pull requests
+  workflow_dispatch: # Enable manual run
 
 jobs:
-  scan:
-    name: Build and test App
+  security:
     runs-on: ubuntu-latest
     steps:
+      # - uses: actions/checkout@main
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - name: Run Safety CLI to check for vulnerabilities
+        uses: pyupio/safety-action@v1
         with:
-          python-version: "3.11"
-      - name: Install package and dependencies
-        run: pip install .[dev]
-      - name: Freeze installed dependencies
-        run: pip freeze > requirements.txt
-      - name: Install safety
-        run: pip install safety
-      - name: Scan CVEs
-        env:
-          SAFETY_API_KEY: ${{ secrets.SAFETY_API_KEY }}
-        run: safety check -r requirements.txt --full-report --policy-file safety-policy.yml
-        working-directory: .
+          api-key: ${{ secrets.SAFETY_API_KEY }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 5c05133..e08e454 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - develop
 
 jobs:
   test:
diff --git a/.github/workflows/safety-scan.yml b/.github/workflows/safety-scan.yml
deleted file mode 100644
index 8130b98..0000000
--- a/.github/workflows/safety-scan.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Safety Scan On Push or Pull
-on:
-  push:  # Run on every push to any branch
-  pull_request:  # Run on new pull requests
-
-jobs:
-  security:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Run Safety CLI to check for vulnerabilities
-        uses: pyupio/safety-action@v1
-        with:
-          api-key: ${{ secrets.SAFETY_API_KEY }}