diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index 5dc570a..619cc90 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -32,112 +32,7 @@ modules:
           - mesa-va-drivers
           - mesa-vulkan-drivers
           - gstreamer1-plugin-libav
-
-  - type: rpm-ostree
-    repos:
-      - https://copr.fedorainfracloud.org/coprs/ublue-os/packages/repo/fedora-%OS_VERSION%/ublue-os-packages-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/solopasha/hyprland/repo/fedora-%OS_VERSION%/solopasha-hyprland-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/peterwu/rendezvous/repo/fedora-%OS_VERSION%/peterwu-rendezvous-fedora-%OS_VERSION%.repo
-      - https://negativo17.org/repos/fedora-steam.repo
-    install:
-    # sddm
-      - sddm
-      - sddm-themes
-      - qt5-qtgraphicaleffects
-      - qt5-qtquickcontrols2
-      - qt5-qtsvg
-
-    # password keeper
-      - kf6-kwallet
-      - kwalletmanager5
-      - pam-kwallet
-    
-    # hyprland
-      - hyprland-git
-      - hyprpanel
-      - hyprpolkitagent
-      - hyprshot
-
-    # ublue udev rules and signing
-      - ublue-os-udev-rules
-      - ublue-os-signing
-    
-    # environment
-      # headset control
-      - headsetcontrol
-      # media related
-      - mediainfo
-      - playerctl
-      - alsa-firmware
-      # zip utilities
-      - p7zip
-      # qt libraries
-      - qt5-qtwayland
-      - qt6-qtwayland
-      # vulkan
-      - vulkan-tools
-      - vulkan-validation-layers
-
-      # polkit
-      - polkit
-    
-      # sound
-      - wireplumber
-      - pipewire
-      - headsetcontrol
-    
-      # networking
-      - bluez
-      - bluez-tools
-      - firewall-config
-    
-    # applications
-      # fuzzy finder
-      - fzf
-    
-      # dmenu runner
-      - fuzzel
-    
-      # file manager
-      - nautilus
-      - file-roller
-      - file-roller-nautilus
-
-      # text editor
-      - neovim
-    
-      # software store
-      - gnome-software
-
-      # disk management
-      - gnome-disk-utility
-
-      # kdeconnect
-      - kde-connect
-    
-    # settings apps
-      # qt
-      - qt5ct
-      - qt6ct
-
-      # gtk
-      - nwg-look
-    
-    # Themes and fonts
-      # emoji fonts
-      - google-noto-emoji-fonts
-    
-      # theme and GUI
-      - fontawesome-fonts-all
-      - gnome-themes-extra
-      - papirus-icon-theme
-      - bibata-cursor-themes
-
-    # zsh
-      - zsh
-      # zoxide for z stuff
-      - zoxide
-
+          
   - type: script
     scripts:
       - install-xpadneo.sh
\ No newline at end of file
diff --git a/recipes/components/rpm-ostree-module.yml b/recipes/components/rpm-ostree-module.yml
new file mode 100644
index 0000000..aae07f5
--- /dev/null
+++ b/recipes/components/rpm-ostree-module.yml
@@ -0,0 +1,6 @@
+modules:
+  - from-file: components/rpm-ostree/core.yml
+  - from-file: components/rpm-ostree/hyprland.yml
+  - from-file: components/rpm-ostree/ublue.yml
+  - from-file: components/rpm-ostree/applications.yml
+  - from-file: components/rpm-ostree/themes.yml
diff --git a/recipes/components/rpm-ostree/applications.yml b/recipes/components/rpm-ostree/applications.yml
new file mode 100644
index 0000000..1c56a1d
--- /dev/null
+++ b/recipes/components/rpm-ostree/applications.yml
@@ -0,0 +1,40 @@
+modules:
+  - type: rpm-ostree
+    install:
+    # applications
+      # fuzzy finder
+      - fzf
+    
+      # dmenu runner
+      - fuzzel
+    
+      # file manager
+      - nautilus
+      - file-roller
+      - file-roller-nautilus
+
+      # text editor
+      - neovim
+    
+      # software store
+      - gnome-software
+
+      # disk management
+      - gnome-disk-utility
+
+      # kdeconnect
+      - kde-connect
+    
+    # settings apps
+      # qt
+      - qt5ct
+      - qt6ct
+
+      # gtk
+      - nwg-look
+
+    # zsh
+      - zsh
+      # zoxide for z stuff
+      - zoxide
+    
diff --git a/recipes/components/rpm-ostree/core.yml b/recipes/components/rpm-ostree/core.yml
new file mode 100644
index 0000000..af55b43
--- /dev/null
+++ b/recipes/components/rpm-ostree/core.yml
@@ -0,0 +1,43 @@
+modules:
+  - type: rpm-ostree
+    install:
+    # sddm
+      - sddm
+      - sddm-themes
+      - qt5-qtgraphicaleffects
+      - qt5-qtquickcontrols2
+      - qt5-qtsvg
+
+    # password keeper
+      - kf6-kwallet
+      - kwalletmanager5
+      - pam-kwallet
+      
+    # environment
+      # headset control
+      - headsetcontrol
+      # media related
+      - mediainfo
+      - playerctl
+      - alsa-firmware
+      # zip utilities
+      - p7zip
+      # qt libraries
+      - qt5-qtwayland
+      - qt6-qtwayland
+      # vulkan
+      - vulkan-tools
+      - vulkan-validation-layers
+
+      # polkit
+      - polkit
+    
+      # sound
+      - wireplumber
+      - pipewire
+      - headsetcontrol
+    
+      # networking
+      - bluez
+      - bluez-tools
+      - firewall-config
\ No newline at end of file
diff --git a/recipes/components/rpm-ostree/hyprland.yml b/recipes/components/rpm-ostree/hyprland.yml
new file mode 100644
index 0000000..7dd0bcf
--- /dev/null
+++ b/recipes/components/rpm-ostree/hyprland.yml
@@ -0,0 +1,9 @@
+modules:
+  - type: rpm-ostree
+    repos:
+      - https://copr.fedorainfracloud.org/coprs/solopasha/hyprland/repo/fedora-%OS_VERSION%/solopasha-hyprland-fedora-%OS_VERSION%.repo
+    install:
+      - hyprland-git
+      - hyprpanel
+      - hyprpolkitagent
+      - hyprshot
\ No newline at end of file
diff --git a/recipes/components/rpm-ostree/themes.yml b/recipes/components/rpm-ostree/themes.yml
new file mode 100644
index 0000000..d74b077
--- /dev/null
+++ b/recipes/components/rpm-ostree/themes.yml
@@ -0,0 +1,14 @@
+modules:
+  - type: rpm-ostree
+    repos:
+      - https://copr.fedorainfracloud.org/coprs/peterwu/rendezvous/repo/fedora-%OS_VERSION%/peterwu-rendezvous-fedora-%OS_VERSION%.repo
+    install:
+    # Themes and fonts
+      # emoji fonts
+      - google-noto-emoji-fonts
+    
+      # theme and GUI
+      - fontawesome-fonts-all
+      - gnome-themes-extra
+      - papirus-icon-theme
+      - bibata-cursor-themes
diff --git a/recipes/components/rpm-ostree/ublue.yml b/recipes/components/rpm-ostree/ublue.yml
new file mode 100644
index 0000000..655e49c
--- /dev/null
+++ b/recipes/components/rpm-ostree/ublue.yml
@@ -0,0 +1,7 @@
+modules:
+  - type: rpm-ostree
+    repos:
+      - https://copr.fedorainfracloud.org/coprs/ublue-os/packages/repo/fedora-%OS_VERSION%/ublue-os-packages-fedora-%OS_VERSION%.repo
+    install:
+      - ublue-os-udev-rules
+      - ublue-os-signing
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 7042d1c..b290671 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -13,6 +13,7 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   - from-file: components/dnf-module.yml
+  - from-file: components/rpm-ostree-module.yml
   - from-file: components/script-module.yml
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml
diff --git a/recipes/recipe_nvidia.yml b/recipes/recipe_nvidia.yml
index bb4008e..bba1fca 100644
--- a/recipes/recipe_nvidia.yml
+++ b/recipes/recipe_nvidia.yml
@@ -13,6 +13,7 @@ image-version: 42 # latest is also supported if you want new updates ASAP
 # you can include multiple instances of the same module
 modules:
   - from-file: components/dnf-module.yml
+  - from-file: components/rpm-ostree.yml
   - from-file: components/script-module.yml
   - from-file: components/sys-files-module.yml
   - from-file: components/systemd-module.yml