diff --git a/autoghgvm.bzl b/autoghgvm.bzl
index 1f3b8cb76faa..c62c94e2dc9b 100644
--- a/autoghgvm.bzl
+++ b/autoghgvm.bzl
@@ -1,5 +1,5 @@
-load(":target_variants.bzl", "lxc_variants")
-load(":msm_kernel_lagvm.bzl", "define_msm_lagvm")
+load(":target_variants.bzl", "la_variants")
+load(":msm_kernel_la.bzl", "define_msm_la")
 load(":image_opts.bzl", "boot_image_opts")
 
 target_name = "autoghgvm"
@@ -62,18 +62,25 @@ def define_autoghgvm():
         "net/qrtr/qrtr-mhi.ko",
     ]
 
-    for variant in lxc_variants:
-        mod_list = _autoghgvm_in_tree_modules
+    _autoghgvm_consolidate_in_tree_modules = _autoghgvm_in_tree_modules + [
+        # keep sorted
+    ]
 
-        define_msm_lagvm(
+    for variant in la_variants:
+        if variant == "consolidate":
+            mod_list = _autoghgvm_consolidate_in_tree_modules
+        else:
+            mod_list = _autoghgvm_in_tree_modules
+
+        define_msm_la(
             msm_target = target_name,
             variant = variant,
             in_tree_module_list = mod_list,
             boot_image_opts = boot_image_opts(
                 boot_partition_size = 0x4000000,
-                boot_image_header_version = 2,
-                base_address = 0x80000000,
-                page_size = 4096,
+                #boot_image_header_version = 2,
+                #base_address = 0x80000000,
+                #page_size = 4096,
                 kernel_vendor_cmdline_extras = [
                     # do not sort
                     "console=hvc0",
diff --git a/build.config.msm.autoghgvm b/build.config.msm.autoghgvm
index b657d5ffb720..477e591c33d7 100644
--- a/build.config.msm.autoghgvm
+++ b/build.config.msm.autoghgvm
@@ -1,26 +1,27 @@
 ################################################################################
 ## Inheriting configs from ACK
-. "${ROOT_DIR}"/msm-kernel/build.config.common
-. "${ROOT_DIR}"/msm-kernel/build.config.aarch64
+. "${ROOT_DIR}"/common/build.config.common
+. "${ROOT_DIR}"/common/build.config.aarch64
 
 ################################################################################
 ## Variant setup
 MSM_ARCH=autoghgvm
-VARIANTS=(defconfig debug_defconfig debug-defconfig perf_defconfig perf-defconfig)
-[ -z "${VARIANT}" ] && VARIANT=debug_defconfig
+VARIANTS=(consolidate gki)
+[ -z "${VARIANT}" ] && VARIANT=gki
 
 if [ -e "${ROOT_DIR}/msm-kernel" ] && [ "${KERNEL_DIR}" = "common" ]; then
     KERNEL_DIR="msm-kernel"
 fi
 
-BOOT_IMAGE_HEADER_VERSION=2
+BOOT_IMAGE_HEADER_VERSION=4
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
 BUILD_VENDOR_DLKM=1
 SUPER_IMAGE_SIZE=0x10000000
 TRIM_UNUSED_MODULES=1
+PREPARE_SYSTEM_DLKM=1
 BUILD_INIT_BOOT_IMG=1
-
+SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
 [ -z "${DT_OVERLAY_SUPPORT}" ] && DT_OVERLAY_SUPPORT=1
 
 if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then
@@ -28,33 +29,9 @@ if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then
 fi
 
 KERNEL_VENDOR_CMDLINE+=' bootconfig '
+KERNEL_VENDOR_CMDLINE+=' initcall_debug=1 ignore_loglevel=1 '
 
 ################################################################################
 ## Inheriting MSM configs
 . ${KERNEL_DIR}/build.config.msm.common
-
-# Common MSM configuration for using GKI defconfig as a fragment
-DEFCONFIG="gki_defconfig"
-
-# boot image macros
-BUILD_BOOT_IMG=1
-BUILD_INITRAMFS=1
-
-# Apply the perf and debug fragments over the GKI defconfig for a hybrid approach
-function build_defconfig_fragments() {
-    if [[ "${VARIANT}" =~ ^(perf_defconfig|debug_defconfig|debug-defconfig)$ ]]; then
-        echo "build_defconfig_fragments: Applying GKI and debug defconfigs"
-        apply_defconfig_fragment "${KERNEL_DIR}/arch/${ARCH}/configs/vendor"/${MSM_ARCH}.config vendor/${MSM_ARCH}_defconfig
-
-        if [ "${VARIANT}" = perf_defconfig ]; then
-            return
-        fi
-
-        apply_defconfig_fragment "${KERNEL_DIR}/arch/${ARCH}/configs/vendor"/${MSM_ARCH}_debug.config vendor/${MSM_ARCH}-debug_defconfig
-    else
-        echo "Variant '${VARIANT}' unsupported"
-        exit 1
-    fi
-}
-
-build_defconfig_fragments
+. ${KERNEL_DIR}/build.config.msm.gki
diff --git a/target_variants.bzl b/target_variants.bzl
index 1b5644c46507..ecad4415ca24 100644
--- a/target_variants.bzl
+++ b/target_variants.bzl
@@ -1,6 +1,7 @@
 la_targets = [
     # keep sorted
     "anorak",
+    "autoghgvm",
     "autogvm",
     "blair",
     "gen3auto",
@@ -24,7 +25,6 @@ lxc_variants = [
 
 lxc_targets = [
     # keep sorted
-    "autoghgvm",
     "autogvm",
     "gen4auto",
 ]