diff --git a/msm_kernel_la.bzl b/msm_kernel_la.bzl
index 53121c21fae1..10d19695c098 100644
--- a/msm_kernel_la.bzl
+++ b/msm_kernel_la.bzl
@@ -351,7 +351,7 @@ def _define_kernel_dist(
     if board_cmdline_extras:
         msm_dist_targets.append("{}_extra_cmdline".format(target))
 
-    board_bc_extras = " ".join(boot_image_opts.board_kernel_cmdline_extras)
+    board_bc_extras = " ".join(boot_image_opts.board_bootconfig_extras)
     if board_bc_extras:
         msm_dist_targets.append("{}_extra_bootconfig".format(target))
 
diff --git a/pineapple.bzl b/pineapple.bzl
index 7db8c3bf70c2..c8fbe6579845 100644
--- a/pineapple.bzl
+++ b/pineapple.bzl
@@ -282,10 +282,10 @@ def define_pineapple():
         "bootconfig",
     ]
 
-    board_kernel_cmdline_extras = []
-    board_bootconfig_extras = []
-
     for variant in la_variants:
+        board_kernel_cmdline_extras = []
+        board_bootconfig_extras = []
+
         if variant == "consolidate":
             mod_list = _pineapple_consolidate_in_tree_modules
         else: