diff --git a/.github/release-draft-config-n-1.yml b/.github/release-draft-config-n-1.yml
index dd2f73f223..8609c62bb9 100644
--- a/.github/release-draft-config-n-1.yml
+++ b/.github/release-draft-config-n-1.yml
@@ -20,7 +20,7 @@
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'v$RESOLVED_VERSION'
 
-commitish: refs/heads/release/202208
+commitish: refs/heads/release/202302
 filter-by-commitish: true
 
 template: |
diff --git a/.github/release-draft-config-n.yml b/.github/release-draft-config-n.yml
index 8609c62bb9..fcf38acfbd 100644
--- a/.github/release-draft-config-n.yml
+++ b/.github/release-draft-config-n.yml
@@ -20,7 +20,7 @@
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'v$RESOLVED_VERSION'
 
-commitish: refs/heads/release/202302
+commitish: refs/heads/release/202311
 filter-by-commitish: true
 
 template: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6c31e2bcf9..01b85ee5e7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -272,6 +272,8 @@ jobs:
 
         # Find the plugin directory that contains the CodeQL plugin
         plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('BaseTools/Plugin/CodeQL'))
+        if not plugin_dir:
+          plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL'))
 
         # This should only be found once
         if len(plugin_dir) == 1:
@@ -327,17 +329,18 @@ jobs:
         import sys
         from pathlib import Path
 
-        # Find the plugin directory that contains the CodeQL plugin
+        # Find the plugin directory that contains the Compiler plugin
         plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CompilerPlugin'))
 
         # This should only be found once
         if len(plugin_dir) == 1:
+            # If the directory is found get the parent Plugin directory
             plugin_dir = str(plugin_dir[0].parent)
 
             with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
                 print(f'pytool_plugin_dir={plugin_dir}', file=fh)
         else:
-            print("::error title=Workspace Error!::Failed to find Mu Basecore pytool plugin directory!")
+            print("::error title=Workspace Error!::Failed to find Mu Basecore .pytool/Plugin directory!")
             sys.exit(1)
 
     - name: Remove CI Plugins Irrelevant to CodeQL
@@ -349,8 +352,8 @@ jobs:
         import shutil
         from pathlib import Path
 
-        # Only this plugin is needed for CodeQL
-        plugins_to_keep = ['CompilerPlugin']
+        # Only these two plugins are needed for CodeQL
+        plugins_to_keep = ['CodeQL', 'CompilerPlugin']
 
         plugin_dir = Path(os.environ['PYTOOL_PLUGIN_DIR']).absolute()
         if plugin_dir.is_dir():
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
index 45c294ccd2..6a5807d3c4 100644
--- a/.github/workflows/release-draft.yml
+++ b/.github/workflows/release-draft.yml
@@ -23,7 +23,7 @@ name: Update Release Draft
 on:
   push:
     branches:
-      - release/202302
+      - release/202311
 
 jobs:
   draft: