diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 863d80af20..026cf7dc58 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -51,11 +51,7 @@ jobs:
             ArchList: "IA32,X64"
           - Package: "UnitTestFrameworkPkg"
             ArchList: "IA32,X64"
-          - Package: "OvmfPkgIa32"
-            ArchList: "IA32"
-          - Package: "OvmfPkgX64"
-            ArchList: "X64"
-          - Package: "OvmfPkgIa32X64"
+          - Package: "OvmfPkg"
             ArchList: "IA32,X64"
           - Package: "UefiPayloadPkg"
             ArchList: "IA32,X64"
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index c6138e696e..3135b24df9 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -80,6 +80,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
                 "DynamicTablesPkg",
                 "EmbeddedPkg",
                 "EmulatorPkg",
+                "Ext4Pkg",
                 "IntelFsp2Pkg",
                 "IntelFsp2WrapperPkg",
                 "MdePkg",
diff --git a/Ext4Pkg/Ext4Pkg.ci.yaml b/Ext4Pkg/Ext4Pkg.ci.yaml
new file mode 100644
index 0000000000..81c7694c5f
--- /dev/null
+++ b/Ext4Pkg/Ext4Pkg.ci.yaml
@@ -0,0 +1,65 @@
+## @file
+# CI configuration for Ext4Pkg
+#
+# Copyright (c) Microsoft Corporation
+# Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+{
+    "LicenseCheck": {
+        "IgnoreFiles": []
+    },
+    "EccCheck": {
+        ## Exception sample looks like below:
+        ## "ExceptionList": [
+        ##     "<ErrorID>", "<KeyWord>"
+        ## ]
+        "ExceptionList": [
+        ],
+        ## Both file path and directory path are accepted.
+        "IgnoreFiles": [
+        ]
+    },
+    "CompilerPlugin": {
+        "DscPath": "Ext4Pkg.dsc"
+    },
+    "CharEncodingCheck": {
+        "IgnoreFiles": []
+    },
+    "DependencyCheck": {
+        "AcceptableDependencies": [
+            "MdePkg/MdePkg.dec",
+            "MdeModulePkg/MdeModulePkg.dec",
+        ],
+        # For host based unit tests
+        "AcceptableDependencies-HOST_APPLICATION":[],
+        # For UEFI shell based apps
+        "AcceptableDependencies-UEFI_APPLICATION":[],
+        "IgnoreInf": []
+    },
+    "DscCompleteCheck": {
+        "IgnoreInf": [],
+        "DscPath": "Ext4Pkg.dsc"
+    },
+    "GuidCheck": {
+        "IgnoreGuidName": [],
+        "IgnoreGuidValue": [],
+        "IgnoreFoldersAndFiles": []
+    },
+    "LibraryClassCheck": {
+        "IgnoreHeaderFile": []
+    },
+    "SpellCheck": {
+        "ExtendWords": [
+            "ELTORITO",
+            "FHAND",
+            "IFILE",
+            "OFILE",
+            "FDISKed",
+            "Lfnbuffer",
+            "FFFFFFFFL",
+            "CDVOL",
+            "DMDEPKG"
+        ]
+    }
+}