diff --git a/.github/codeql/codeql-coding-standard.yml b/.github/codeql/codeql-coding-standard.yml
index f68d01b42..718b750e9 100644
--- a/.github/codeql/codeql-coding-standard.yml
+++ b/.github/codeql/codeql-coding-standard.yml
@@ -3,17 +3,5 @@ name: "CodeQL Coding Standard Configuration File"
 disable-default-queries: true
 
 queries:
-  - name: JPL Rules
-    uses: github/codeql/cpp/ql/src/JPL_C@main
-  - name: MISRA Rule 9-5-1
-    uses: github/codeql/cpp/ql/src/jsf/4.20 Unions and Bit Fields/AV Rule 153.ql@main
-  - name: MISRA Rule 5-18-1
-    uses: github/codeql/cpp/ql/src/jsf/4.21 Operators/AV Rule 168.ql@main
-  - name: MISRA 6-2-2
-    uses: github/codeql/cpp/ql/src/jsf/4.25 Expressions/AV Rule 202.ql@main
-  - name: MISRA Rule 5-14-1
-    uses: github/codeql/cpp/ql/src/jsf/4.21 Operators/AV Rule 165.ql@main
-  - name: MISRA Rule 5-3-2
-    uses: github/codeql/cpp/ql/src/jsf/4.21 Operators/AV Rule 165.ql@main
-  - name: MISRA Rule 7-5-2
-    uses: github/codeql/cpp/ql/src/jsf/4.22 Pointers and References/AV Rule 173.ql@main
\ No newline at end of file
+  - name: JPL and MISRA
+    uses: ./.github/codeql/jpl-misra.qls
\ No newline at end of file
diff --git a/.github/codeql/jpl-misra.qls b/.github/codeql/jpl-misra.qls
new file mode 100644
index 000000000..cfb114031
--- /dev/null
+++ b/.github/codeql/jpl-misra.qls
@@ -0,0 +1,21 @@
+# Start with all the queries in the codeql/cpp-queries pack.
+- queries: .
+  from: codeql/cpp-queries
+# Restrict to only the queries with the following ID patterns.
+- include:
+    id:
+      # Regular expression matching all query IDs that start with `cpp/jpl-c/`
+      # This covers all queries in the `JPL_C` directory,
+      # but matching on query ID is more stable.
+      - /cpp/jpl-c/*/
+      # Specific JSF queries, identified by query ID.
+      # MISRA Rule 9-5-1
+      - cpp/jsf/av-rule-153
+      # MISRA Rule 5-18-1
+      - cpp/jsf/av-rule-168
+      # MISRA 6-2-2
+      - cpp/jsf/av-rule-202
+      # MISRA Rule 5-14-1
+      - cpp/jsf/av-rule-165
+      # MISRA Rule 5-3-2
+      - cpp/jsf/av-rule-173
\ No newline at end of file
diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml
index 519004cb9..2241b2d17 100644
--- a/.github/workflows/codeql-build.yml
+++ b/.github/workflows/codeql-build.yml
@@ -100,14 +100,6 @@ jobs:
            git log -1 --pretty=oneline
            git submodule
 
-      - name: Checkout codeql code      
-        if: ${{ !steps.skip-workflow.outputs.skip }}
-        uses: actions/checkout@v2
-        with:
-          repository: github/codeql 
-          submodules: true 
-          path: codeql
-
       - name: Initialize CodeQL
         if: ${{ !steps.skip-workflow.outputs.skip }}
         uses: github/codeql-action/init@v1
diff --git a/.gitmodules b/.gitmodules
index 9aa55c132..185834fe2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "cfe"]
 	path = cfe
 	url = https://github.com/nasa/cFE.git
-	branch = master
+	branch = main
 [submodule "osal"]
 	path = osal
 	url = https://github.com/nasa/osal.git
-	branch = master
+	branch = main
 [submodule "psp"]
 	path = psp
 	url = https://github.com/nasa/PSP.git
diff --git a/README.md b/README.md
index a8c1311a8..329f062ee 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
-[![Build Status](https://travis-ci.com/nasa/cFS.svg)](https://travis-ci.com/nasa/cFS)
-[![LGTM Alerts](https://img.shields.io/lgtm/alerts/github/nasa/cFS)](https://lgtm.com/projects/g/nasa/cFS/alerts/?mode=list)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/python/github/nasa/cFS)](https://lgtm.com/projects/g/nasa/cFS/alerts/?mode=list)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/cpp/github/nasa/cFS)](https://lgtm.com/projects/g/nasa/cFS/alerts/?mode=list)
+[![Build Linux](https://github.com/nasa/cfs/actions/workflows/build-cfs.yml/badge.svg)](https://github.com/nasa/cfs/actions/workflows/build-cfs.yml)
+[![Build RTEMS 5](https://github.com/nasa/cFS/actions/workflows/build-cfs-rtems5.yml/badge.svg)](https://github.com/nasa/cFS/actions/workflows/build-cfs-rtems5.yml)
+[![LGTM Alerts](https://img.shields.io/lgtm/alerts/github/nasa/cFS.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/cFS/alerts/?mode=list)
+[![LGTM Grade](https://img.shields.io/lgtm/grade/cpp/g/nasa/cFS.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/cFS/context:cpp)
+[![LGTM Grade](https://img.shields.io/lgtm/grade/python/g/nasa/cFS.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/cFS/context:python)
 
 # Core Flight System - BUNDLE
 
@@ -15,7 +16,7 @@ The cFS Framework is a core subset of cFS.  There are additional OSALs, PSPs, an
   - cFE User's Guide: https://github.com/nasa/cFS/blob/gh-pages/cFE_Users_Guide.pdf
   - OSAL User's Guide: https://github.com/nasa/cFS/blob/gh-pages/OSAL_Users_Guide.pdf
   - cFE App Developer's Guide: https://github.com/nasa/cFE/blob/main/docs/cFE%20Application%20Developers%20Guide.md
-  - Training documentation: https://ntrs.nasa.gov/citations/20205000691
+  - Training documentation: https://ntrs.nasa.gov/citations/20210022378
   - cFS Overview: https://cfs.gsfc.nasa.gov/cFS-OviewBGSlideDeck-ExportControl-Final.pdf
 
 ## Release Notes
diff --git a/cfe b/cfe
index 98f78e860..b66661cc6 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit 98f78e8604c19415fd1e199eae94196a781539b8
+Subproject commit b66661cc6e8f695d5ca9fa56217f58a291d5884d