diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql.yml
similarity index 56%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/codeql.yml
index deb5a3e7..867407e3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql.yml
@@ -13,21 +13,18 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: ["main"]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: ["main"]
   schedule:
-    - cron: "37 14 * * 4"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    - cron: "39 13 * * 2"
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
       contents: read
@@ -37,8 +34,10 @@ jobs:
       fail-fast: false
       matrix:
         language: ["python"]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
       - name: Checkout repository
@@ -52,23 +51,26 @@ jobs:
           # If you wish to specify custom queries, you can do so here or in a config file.
           # By default, queries listed here will override any specified in a config file.
           # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
         uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-      #- run: |
-      #   make bootstrap
-      #   make release
+      # - run: |
+      #     echo "Run, Build Application using script"
+      #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/continuous_integration/environment_actions.yml b/continuous_integration/environment_actions.yml
index 1effadca..bb0a6d1a 100644
--- a/continuous_integration/environment_actions.yml
+++ b/continuous_integration/environment_actions.yml
@@ -2,7 +2,6 @@
 name: radtraq_env
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - act-atmos
   - numpy
diff --git a/radtraq/tests/test_plotting.py b/radtraq/tests/test_plotting.py
index 399a19d4..ac3173f1 100644
--- a/radtraq/tests/test_plotting.py
+++ b/radtraq/tests/test_plotting.py
@@ -1,3 +1,4 @@
+import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 import pytest
@@ -9,6 +10,8 @@
 from radtraq.plotting.corner_reflector import plot_cr_raster
 from radtraq.plotting.self_consistency import plot_self_consistency
 
+matplotlib.use('Agg')
+
 
 @pytest.mark.mpl_image_compare(tolerance=10)
 def test_plotting():