diff --git a/recipes/common/cosmic.yml b/recipes/common/cosmic.yml
index e139b63..fb70970 100644
--- a/recipes/common/cosmic.yml
+++ b/recipes/common/cosmic.yml
@@ -1,6 +1,7 @@
 modules:
-  - type: rpm-ostree
+  - type: dnf
     repos:
-      - https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-%OS_VERSION%/ryanabx-cosmic-epoch-fedora-%OS_VERSION%.repo
+      copr:
+        - ryanabx/cosmic-epoch
     install:
       - cosmic-desktop
diff --git a/recipes/common/dev-apps-bootc.yml b/recipes/common/dev-apps-bootc.yml
deleted file mode 100644
index ce1d7b5..0000000
--- a/recipes/common/dev-apps-bootc.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-modules:
-  - type: dnf
-    # source: local
-    install:
-      packages:
-        - virt-manager
-        - alacritty
-        - gnome-boxes
diff --git a/recipes/common/dev-apps.yml b/recipes/common/dev-apps.yml
index 707b34e..a510d78 100644
--- a/recipes/common/dev-apps.yml
+++ b/recipes/common/dev-apps.yml
@@ -1,6 +1,7 @@
 modules:
-  - type: rpm-ostree
+  - type: dnf
     install:
-      - virt-manager
-      - alacritty
-      - gnome-boxes
+      packages:
+        - virt-manager
+        - alacritty
+        - gnome-boxes
diff --git a/recipes/common/dev-packages-bootc.yml b/recipes/common/dev-packages-bootc.yml
deleted file mode 100644
index 4722c0c..0000000
--- a/recipes/common/dev-packages-bootc.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
-modules:
-  - type: dnf
-    # source: local
-    repos:
-      cleanup: true
-      files:
-        - kubectl.repo
-        - google-cloud-sdk.repo
-        - opentofu.repo
-        - https://pkg.earthly.dev/earthly.repo
-        - https://cli.github.com/packages/rpm/gh-cli.repo
-        - https://download.docker.com/linux/fedora/docker-ce.repo
-        - https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
-    group-install:
-      packages:
-        - development-tools
-    install:
-      packages:
-        - docker-ce
-        - docker-ce-cli
-        - containerd.io
-        - docker-buildx-plugin 
-        - docker-compose-plugin
-        - cmake
-        - "gcc-c++"
-        - earthly
-        - kubectl
-        - helm
-        - pylsp
-        - parallel
-        - gcc-aarch64-linux-gnu
-        - gcc-c++-aarch64-linux-gnu
-        - musl-gcc
-        - openssl-devel
-        - bat
-        - gh
-        - go
-        - git-lfs
-        - google-cloud-cli
-        - erlang
-        - erlang-doc
-        - elixir
-        - elixir-doc
-        - zlib-devel
-        - glab
-        - hugo
-        - copr-cli
-        - rpm-build
-        - rpm-devel
-        - rpmlint
-        - diffutils
-        - patch
-        - rpmdevtools
-        - protobuf-compiler
-        - helix
-        - tofu
-        - terraform-ls
-  - type: systemd
-    system:
-      enabled:
-      - docker.service
-  - type: script
-    scripts:
-      - install-mkcert.sh
-      - install-codelldb.sh
-      - install-zellij.nu
diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml
index 18d260e..863d02c 100644
--- a/recipes/common/dev-packages.yml
+++ b/recipes/common/dev-packages.yml
@@ -1,47 +1,58 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
-  - from-file: common/docker-engine.yml
-  - type: rpm-ostree
+  - type: dnf
     repos:
-      - kubectl.repo
-      - google-cloud-sdk.repo
-      - https://pkg.earthly.dev/earthly.repo
-      - https://cli.github.com/packages/rpm/gh-cli.repo
+      cleanup: true
+      files:
+        - kubectl.repo
+        - google-cloud-sdk.repo
+        - opentofu.repo
+        - https://pkg.earthly.dev/earthly.repo
+        - https://cli.github.com/packages/rpm/gh-cli.repo
+        - https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
+    group-install:
+      packages:
+        - development-tools
     install:
-      - cmake
-      - "gcc-c++"
-      - earthly
-      - kubectl
-      - helm
-      - pylsp
-      - parallel
-      - gcc-aarch64-linux-gnu
-      - gcc-c++-aarch64-linux-gnu
-      - musl-gcc
-      - openssl-devel
-      - bat
-      - gh
-      - go
-      - git-lfs
-      - google-cloud-cli
-      # - erlang
-      # - erlang-doc
-      # - elixir
-      # - elixir-doc
-      - zlib-devel
-      - glab
-      - hugo
-      - copr-cli
-      - rpm-build
-      - rpm-devel
-      - rpmlint
-      - diffutils
-      - patch
-      - rpmdevtools
-      - protobuf-compiler
+      packages:
+        - cmake
+        - "gcc-c++"
+        - earthly
+        - kubectl
+        - helm
+        - pylsp
+        - parallel
+        - gcc-aarch64-linux-gnu
+        - gcc-c++-aarch64-linux-gnu
+        - musl-gcc
+        - openssl-devel
+        - bat
+        - gh
+        - go
+        - git-lfs
+        - google-cloud-cli
+        - erlang
+        - erlang-doc
+        - elixir
+        - elixir-doc
+        - zlib-devel
+        - glab
+        - hugo
+        - copr-cli
+        - rpm-build
+        - rpm-devel
+        - rpmlint
+        - diffutils
+        - patch
+        - rpmdevtools
+        - protobuf-compiler
+        - helix
+        - tofu
+        - terraform-ls
   - type: script
     scripts:
       - install-mkcert.sh
       - install-codelldb.sh
       - install-zellij.nu
+  - from-file: common/docker-engine.yml
diff --git a/recipes/common/docker-engine.yml b/recipes/common/docker-engine.yml
index 4e96c64..0349436 100644
--- a/recipes/common/docker-engine.yml
+++ b/recipes/common/docker-engine.yml
@@ -1,13 +1,15 @@
 modules:
-- type: rpm-ostree
+- type: dnf
   repos:
-    - https://download.docker.com/linux/fedora/docker-ce.repo
+    files:
+      - https://download.docker.com/linux/fedora/docker-ce.repo
   install:
-    - docker-ce
-    - docker-ce-cli
-    - containerd.io
-    - docker-buildx-plugin 
-    - docker-compose-plugin
+    packages:
+      - docker-ce
+      - docker-ce-cli
+      - containerd.io
+      - docker-buildx-plugin 
+      - docker-compose-plugin
 - type: systemd
   system:
     enabled:
diff --git a/recipes/common/gaming-bootc.yml b/recipes/common/gaming-bootc.yml
deleted file mode 100644
index c05fa2e..0000000
--- a/recipes/common/gaming-bootc.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
-modules:
-  - type: files
-    files:
-      - source: steam-firewall
-        destination: /
-  - type: dnf
-    optfix:
-      - r2modman
-    install:
-      packages:
-        - https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.49/r2modman-3.1.49.x86_64.rpm
-        # - steam
diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml
index c63a378..c05fa2e 100644
--- a/recipes/common/gaming.yml
+++ b/recipes/common/gaming.yml
@@ -5,15 +5,10 @@ modules:
     files:
       - source: steam-firewall
         destination: /
-  # - type: bling
-  #   source: ghcr.io/blue-build/modules/bling:343-featbling-add-rpmfusion-install-script
-  #   install:
-  #     - negativo17
-  # - type: script
-  #   scripts:
-  #     - install-steam.sh
-  - type: rpm-ostree
+  - type: dnf
     optfix:
       - r2modman
     install:
-      - https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.49/r2modman-3.1.49.x86_64.rpm
+      packages:
+        - https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.49/r2modman-3.1.49.x86_64.rpm
+        # - steam
diff --git a/recipes/common/jp-common-bootc.yml b/recipes/common/jp-common-bootc.yml
deleted file mode 100644
index fa01e4f..0000000
--- a/recipes/common/jp-common-bootc.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
-modules:
-  - from-file: common/common.yml
-  - from-file: common/pipewire-tweaks.yml
-  - from-file: common/jp-packages-bootc.yml
-  - from-file: common/gaming-bootc.yml
-  - from-file: common/dev-packages-bootc.yml
-  - from-file: common/dev-apps-bootc.yml
-  - from-file: common/updates.yml
-  - type: files
-    files:
-      - source: distrobox
-        destination: /
-  - type: fonts
-    fonts:
-      nerd-fonts:
-        - JetBrainsMono
-        - NerdFontsSymbolsOnly
-  - from-file: common/bluebuild-logo.yml
-  - from-file: common/jp-chezmoi.yml
diff --git a/recipes/common/jp-desktop-bootc.yml b/recipes/common/jp-desktop-bootc.yml
deleted file mode 100644
index 497b113..0000000
--- a/recipes/common/jp-desktop-bootc.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
-modules:
-  # - type: dnf
-  #   repos:
-  #     cleanup: true
-  #     nonfree: negativo17
-  #   install:
-  #     packages:
-  #       - steam
-  # - type: dnf
-  #   repos:
-  #     cleanup: true
-  #     nonfree: rpmfusion
-  # - type: dnf
-  #   repos:
-  #     cleanup: true
-  #     nonfree: rpmfusion
-  # - type: dnf
-  #   repos:
-  #     cleanup: true
-  #     nonfree: negativo17
-  #   install:
-  #     packages:
-  #       - steam
-  - type: dnf
-    # repos:
-    #   cleanup: true
-    #   copr:
-    #     - ryanabx/cosmic-epoch
-    group-install:
-      packages:
-        - cosmic-desktop-environment
-    # install:
-    #   packages:
-    #     # - cosmic-desktop
-    #     - plasma-workspace-x11
-  - type: files
-    files:
-      - source: desktop-audio
-        destination: /
-  - from-file: common/jp-common-bootc.yml
diff --git a/recipes/common/jp-desktop.yml b/recipes/common/jp-desktop.yml
index 8b8b5b1..135ff8a 100644
--- a/recipes/common/jp-desktop.yml
+++ b/recipes/common/jp-desktop.yml
@@ -1,6 +1,40 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
+  # - type: dnf
+  #   repos:
+  #     cleanup: true
+  #     nonfree: negativo17
+  #   install:
+  #     packages:
+  #       - steam
+  # - type: dnf
+  #   repos:
+  #     cleanup: true
+  #     nonfree: rpmfusion
+  # - type: dnf
+  #   repos:
+  #     cleanup: true
+  #     nonfree: rpmfusion
+  # - type: dnf
+  #   repos:
+  #     cleanup: true
+  #     nonfree: negativo17
+  #   install:
+  #     packages:
+  #       - steam
+  - type: dnf
+    # repos:
+    #   cleanup: true
+    #   copr:
+    #     - ryanabx/cosmic-epoch
+    group-install:
+      packages:
+        - cosmic-desktop-environment
+    # install:
+    #   packages:
+    #     # - cosmic-desktop
+    #     - plasma-workspace-x11
   - type: files
     files:
       - source: desktop-audio
diff --git a/recipes/common/jp-laptop-bootc.yml b/recipes/common/jp-laptop-bootc.yml
deleted file mode 100644
index b9b0d2c..0000000
--- a/recipes/common/jp-laptop-bootc.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
-modules:
-  # - from-file: common/bootc-setup.yml
-  - type: dnf
-    # repos:
-    #   cleanup: true
-    #   copr:
-    #     - ryanabx/cosmic-epoch
-    group-install:
-      packages:
-        - cosmic-desktop-environment
-    install:
-      packages:
-        # - cosmic-desktop
-        - fprintd
-        - fprintd-pam
-  - from-file: common/jp-common-bootc.yml
diff --git a/recipes/common/jp-laptop.yml b/recipes/common/jp-laptop.yml
index 2f2f875..f31cee1 100644
--- a/recipes/common/jp-laptop.yml
+++ b/recipes/common/jp-laptop.yml
@@ -1,6 +1,18 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
-  - type: rpm-ostree
+  # - from-file: common/bootc-setup.yml
+  - type: dnf
+    # repos:
+    #   cleanup: true
+    #   copr:
+    #     - ryanabx/cosmic-epoch
+    group-install:
+      packages:
+        - cosmic-desktop-environment
     install:
-      - fprintd
-      - fprintd-pam
+      packages:
+        # - cosmic-desktop
+        - fprintd
+        - fprintd-pam
   - from-file: common/jp-common.yml
diff --git a/recipes/common/jp-minis.yml b/recipes/common/jp-minis.yml
index fc46f8b..136874c 100644
--- a/recipes/common/jp-minis.yml
+++ b/recipes/common/jp-minis.yml
@@ -1,21 +1,19 @@
 modules:
   - from-file: common/common.yml
+  - from-file: common/updates.yml
+  - from-file: common/bluebuild-logo.yml
+  - from-file: common/jp-chezmoi.yml
+  - from-file: common/docker-engine.yml
   - type: dnf
     repos:
       cleanup: true
       files:
         - kubectl.repo
         - opentofu.repo
-        - https://download.docker.com/linux/fedora/docker-ce.repo
         - https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
         - fury.repo
     install:
       packages:
-        - docker-ce
-        - docker-ce-cli
-        - containerd.io
-        - docker-buildx-plugin 
-        - docker-compose-plugin
         - kubectl
         - helm
         - helix
@@ -36,6 +34,3 @@ modules:
       - docker.service
       - create_rke_user.service
       - sshd.service
-  - from-file: common/updates.yml
-  - from-file: common/bluebuild-logo.yml
-  - from-file: common/jp-chezmoi.yml
diff --git a/recipes/common/jp-packages-bootc.yml b/recipes/common/jp-packages-bootc.yml
deleted file mode 100644
index 93d21eb..0000000
--- a/recipes/common/jp-packages-bootc.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
-modules:
-  - type: dnf
-    optfix:
-      - brave.com
-    repos:
-      cleanup: true
-      files:
-        - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
-        - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
-        - fury.repo
-      keys:
-        - https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
-    install:
-      packages:
-        - libadwaita
-        - cronie
-        - plasma-browser-integration
-        - id3v2
-        - xinput
-        - ripgrep
-        - tailscale
-        - strawberry
-        - xclip
-        - bat
-        - brave-browser
-        - syncthing
-        - fish
-        - cabextract
-        - xorg-x11-font-utils
-        - fontconfig
-        - nu
-        - util-linux
-        - carapace-bin
-        - https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
-        - libreoffice
-        - https://github.com/balena-io/etcher/releases/download/v2.1.0/balena-etcher-2.1.0-1.x86_64.rpm
-  - type: script
-    scripts:
-      - install-bitwarden.nu
-  - type: systemd
-    user:
-      enabled:
-        - syncthing
diff --git a/recipes/common/jp-packages.yml b/recipes/common/jp-packages.yml
index b34ef83..93d21eb 100644
--- a/recipes/common/jp-packages.yml
+++ b/recipes/common/jp-packages.yml
@@ -1,32 +1,41 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
-  - type: rpm-ostree
-    keys:
-      - https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
+  - type: dnf
     optfix:
       - brave.com
     repos:
-      - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
-      - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
-      - fury.repo
+      cleanup: true
+      files:
+        - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
+        - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+        - fury.repo
+      keys:
+        - https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
     install:
-      - libadwaita
-      - cronie
-      - plasma-browser-integration
-      - id3v2
-      - xinput
-      - ripgrep
-      - tailscale
-      - strawberry
-      - xclip
-      - bat
-      - brave-browser
-      - syncthing
-      - fish
-      - nu
-      - util-linux
-      - carapace-bin
+      packages:
+        - libadwaita
+        - cronie
+        - plasma-browser-integration
+        - id3v2
+        - xinput
+        - ripgrep
+        - tailscale
+        - strawberry
+        - xclip
+        - bat
+        - brave-browser
+        - syncthing
+        - fish
+        - cabextract
+        - xorg-x11-font-utils
+        - fontconfig
+        - nu
+        - util-linux
+        - carapace-bin
+        - https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
+        - libreoffice
+        - https://github.com/balena-io/etcher/releases/download/v2.1.0/balena-etcher-2.1.0-1.x86_64.rpm
   - type: script
     scripts:
       - install-bitwarden.nu
@@ -34,4 +43,3 @@ modules:
     user:
       enabled:
         - syncthing
-  - from-file: common/ms-fonts.yml
diff --git a/recipes/common/sway.yml b/recipes/common/sway.yml
index 1616159..061995a 100644
--- a/recipes/common/sway.yml
+++ b/recipes/common/sway.yml
@@ -1,18 +1,22 @@
 modules:
-  - type: rpm-ostree
+  - type: dnf
     install:
-      - sway
-      - wofi
-      - light
-      - swaybg
-      - swayidle
-      - waybar
-      - mako
-      - fontawesome-fonts
-  - type: rpm-ostree
+      packages:
+        - sway
+        - wofi
+        - light
+        - swaybg
+        - swayidle
+        - waybar
+        - mako
+        - fontawesome-fonts
+  - type: dnf
     repos:
-      - https://copr.fedorainfracloud.org/coprs/eddsalkield/swaylock-effects/repo/fedora-%OS_VERSION%/eddsalkield-swaylock-effects-fedora-%OS_VERSION%.repo
+      copr:
+      - eddsalkield/swaylock-effects
     remove:
-      - swaylock
+      packages:
+        - swaylock
     install:
-      - swaylock-effects
+      packages:
+        - swaylock-effects
diff --git a/recipes/jp-desktop-nvidia-bootc.yml b/recipes/jp-desktop-nvidia-bootc.yml
index c78c0f8..ae24b86 100644
--- a/recipes/jp-desktop-nvidia-bootc.yml
+++ b/recipes/jp-desktop-nvidia-bootc.yml
@@ -9,6 +9,6 @@ alt-tags:
 # stages:
   # - from-file: common/helix.yml
 modules:
-  - from-file: common/jp-desktop-bootc.yml
+  - from-file: common/jp-desktop.yml
   # - from-file: common/helix.yml
   - from-file: common/post-build.yml
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index a16d313..5340936 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -19,8 +19,7 @@ nushell-version: none
   #       # ref: db13eea91c15ca57d76454432d1fb9c09c51ba8c # Last known working commit
   #       ref: 605bb63a4de640b77f6d3017238ece48cb286933 # supposed fix
 modules:
-  # - from-file: common/jp-desktop.yml
-  - from-file: common/jp-desktop-bootc.yml
+  - from-file: common/jp-desktop.yml
   # - from-file: common/cosmic.yml
   # - from-file: common/helix.yml
   # - type: copy
diff --git a/recipes/jp-laptop-bootc.yml b/recipes/jp-laptop-bootc.yml
index 6b90731..1b1d4aa 100644
--- a/recipes/jp-laptop-bootc.yml
+++ b/recipes/jp-laptop-bootc.yml
@@ -16,7 +16,7 @@ description: The image of Wunker OS for JP's Laptop.
   #       component: cosmic-comp
   #       debug: true
 modules:
-  - from-file: common/jp-laptop-bootc.yml
+  - from-file: common/jp-laptop.yml
   # - from-file: common/helix.yml
   # - type: copy
   #   from: cosmic-comp
diff --git a/recipes/jp-laptop-cosmic.yml b/recipes/jp-laptop-cosmic.yml
index 8589274..07ba053 100644
--- a/recipes/jp-laptop-cosmic.yml
+++ b/recipes/jp-laptop-cosmic.yml
@@ -8,7 +8,8 @@ stages:
   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-laptop.yml
-  - type: rpm-ostree
+  - type: dnf
     install:
-      - steam
+      packages:
+        - steam
   - from-file: common/helix.yml
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index 915eb05..27af223 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -8,8 +8,7 @@ description: The image of Wunker OS for JP's Laptop.
 # stages:
 #   - from-file: common/helix.yml
 modules:
-  # - from-file: common/jp-laptop.yml
-  - from-file: common/jp-laptop-bootc.yml
+  - from-file: common/jp-laptop.yml
   - from-file: common/cosmic.yml
   # - from-file: common/helix.yml
   - from-file: common/post-build.yml
diff --git a/recipes/jp-truenas.yml b/recipes/jp-truenas.yml
index 316611d..c529748 100644
--- a/recipes/jp-truenas.yml
+++ b/recipes/jp-truenas.yml
@@ -11,8 +11,9 @@ modules:
   # - type: script
   #   scripts:
   #     - install-syncthing.sh
-  - type: rpm-ostree
+  - type: dnf
     install:
+      packages:
       - syncthing
   - type: systemd
     user:
diff --git a/recipes/rawhide-test.yml b/recipes/rawhide-test.yml
index 465d594..f445c39 100644
--- a/recipes/rawhide-test.yml
+++ b/recipes/rawhide-test.yml
@@ -3,10 +3,11 @@
 name: jp-test
 base-image: quay.io/fedora/fedora-kinoite
 image-version: rawhide
-alt_tags:
+alt-tags:
   - rawhide
 description: The image of Wunker OS for JP's Laptop.
 modules:
-  - type: rpm-ostree
+  - type: dnf
     install:
-      - bat
+      packages:
+        - bat