diff --git a/elements/collections/boot.bst b/elements/collections/boot.bst
index d809b90c4..db32e06c7 100644
--- a/elements/collections/boot.bst
+++ b/elements/collections/boot.bst
@@ -3,3 +3,5 @@ kind: stack
 depends:
   - collections/boot/initramfs.bst
   - components/firmware.bst
+
+  - proprietary/nvidia-drivers/package.bst 
diff --git a/elements/collections/boot/initramfs/deps.bst b/elements/collections/boot/initramfs/deps.bst
index 5ca3ac0f6..c6b388d56 100644
--- a/elements/collections/boot/initramfs/deps.bst
+++ b/elements/collections/boot/initramfs/deps.bst
@@ -13,4 +13,5 @@ depends:
 - freedesktop-sdk.bst:components/pkg-config.bst
 - components/linux.bst
 - components/firmware.bst
+- proprietary/nvidia-drivers/package.bst
 - components/plymouth.bst
diff --git a/elements/components/waydroid-image.bst b/elements/components/waydroid-image.bst
deleted file mode 100644
index 4ca2320d1..000000000
--- a/elements/components/waydroid-image.bst
+++ /dev/null
@@ -1,18 +0,0 @@
-kind: import
-
-config:
-  target: "%{datadir}/waydroid-extra/images"
-
-sources:
-- kind: zip
-  base-dir: ''
-  url: 
-    sourceforge_project:waydroid/files/images/system/lineage/waydroid_x86_64/lineage-18.1-20231007-VANILLA-waydroid_x86_64-system.zip
-
-  ref: 19ae5b09c66a79a607484c52a8e36f689ab189cb12443837720af845a0f4f798
-
-- kind: zip
-  url: 
-    sourceforge_project:waydroid/files/images/vendor/waydroid_x86_64/lineage-18.1-20231007-MAINLINE-waydroid_x86_64-vendor.zip
-  base-dir: ''
-  ref: 96341f437261cd477b52bdcbddcd9ae69bcacf93ac480c89ce474587d9494478
diff --git a/elements/components/waydroid.bst b/elements/components/waydroid.bst
index 06cfad3b8..94b54547e 100644
--- a/elements/components/waydroid.bst
+++ b/elements/components/waydroid.bst
@@ -8,7 +8,7 @@ depends:
 - freedesktop-sdk.bst:components/python3-dbus.bst
 
 runtime-depends:
-- components/waydroid-image.bst
+- components/waydroid-script.bst
 
 config:
   install-commands:
diff --git a/elements/installer/initramfs.bst b/elements/installer/boot.bst
similarity index 95%
rename from elements/installer/initramfs.bst
rename to elements/installer/boot.bst
index bc4942536..8d195534d 100644
--- a/elements/installer/initramfs.bst
+++ b/elements/installer/boot.bst
@@ -1,8 +1,8 @@
 kind: script
 
 build-depends:
-  - installer/initramfs/deps.bst
-  - installer/initramfs/initial-scripts.bst
+  - installer/boot/deps.bst
+  - installer/boot/initial-scripts.bst
   - freedesktop-sdk.bst:vm/prepare-image.bst
 
 variables:
diff --git a/elements/installer/initramfs/deps.bst b/elements/installer/boot/deps.bst
similarity index 92%
rename from elements/installer/initramfs/deps.bst
rename to elements/installer/boot/deps.bst
index ededccf5c..1286fc143 100644
--- a/elements/installer/initramfs/deps.bst
+++ b/elements/installer/boot/deps.bst
@@ -9,6 +9,8 @@ depends:
   - freedesktop-sdk.bst:components/gzip.bst
   - components/firmware.bst
   - components/linux.bst
+  
+  - proprietary/nvidia-drivers/package.bst
 
   - freedesktop-sdk.bst:components/pkg-config.bst
   - freedesktop-sdk.bst:components/shadow.bst
diff --git a/elements/installer/initramfs/initial-scripts.bst b/elements/installer/boot/initial-scripts.bst
similarity index 74%
rename from elements/installer/initramfs/initial-scripts.bst
rename to elements/installer/boot/initial-scripts.bst
index d061e1e7b..3060b6944 100644
--- a/elements/installer/initramfs/initial-scripts.bst
+++ b/elements/installer/boot/initial-scripts.bst
@@ -1,7 +1,7 @@
 kind: collect_initial_scripts
 
 build-depends:
-- installer/initramfs/deps.bst
+- installer/boot/deps.bst
 
 config:
   path: /etc/fdsdk/initial_scripts
diff --git a/elements/installer/deps.bst b/elements/installer/deps.bst
index c61d8591e..913780759 100644
--- a/elements/installer/deps.bst
+++ b/elements/installer/deps.bst
@@ -17,6 +17,8 @@ depends:
   - components/linux.bst
   - components/firmware.bst
 
+  - proprietary/nvidia-drivers/package.bst
+
   - freedesktop-sdk.bst:components/shadow.bst
   - freedesktop-sdk.bst:vm/mesa-default.bst
   - freedesktop-sdk.bst:vm/config/journald.bst
diff --git a/elements/installer/image.bst b/elements/installer/image.bst
index d14f95b5c..163732192 100644
--- a/elements/installer/image.bst
+++ b/elements/installer/image.bst
@@ -9,7 +9,7 @@ build-depends:
   config:
     location: "/sysroot"
 - installer/initial-scripts.bst
-- filename: installer/initramfs.bst
+- filename: installer/boot.bst
   config:
     location: "/sysroot/efi"