diff --git a/src/commands/generate-full.ts b/src/commands/generate-full.ts
index b28e675..42c0534 100644
--- a/src/commands/generate-full.ts
+++ b/src/commands/generate-full.ts
@@ -197,7 +197,6 @@ export default class GenerateFull extends Command {
     build.deviceMakefile = {
       props: missingProps,
       fingerprint: fingerprint,
-      ...(missingOtaParts.length > 0 && { abOtaPartitions: missingOtaParts }),
       vintfManifestPaths: vintfManifestPaths,
       ...build.deviceMakefile,
     }
@@ -205,6 +204,7 @@ export default class GenerateFull extends Command {
     // Add board parts
     build.boardMakefile = {
       secontextResolutions: ctxResolutions,
+      ...(missingOtaParts.length > 0 && { abOtaPartitions: missingOtaParts }),
       ...(fwPaths != null && { boardInfo: `${dirs.firmware}/${ANDROID_INFO}` }),
     }