diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0d79a9..5c715bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,7 +77,6 @@ legacy-build-images:
     matrix:
       - RECIPE:
           - wke-server.yml
-          - wke-worker.yml
 
 build-images:
   extends:
@@ -85,13 +84,14 @@ build-images:
   stage: build
   variables:
     BB_BUILD_PUSH: 'true'
-    # TAG: 340-feat-multiarch
   needs:
     - job: base-images
       optional: true
   parallel:
     matrix:
       - RECIPE:
+          - wke-worker.yml
+          - wke-fw-desktop.yml
           - cp-laptop.yml
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
diff --git a/files/nvidia/usr/lib/bootc/kargs.d/20-nvidia.toml b/files/nvidia/usr/lib/bootc/kargs.d/20-nvidia.toml
deleted file mode 100644
index 4790494..0000000
--- a/files/nvidia/usr/lib/bootc/kargs.d/20-nvidia.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-kargs = [
-  "rd.driver.blacklist=nouveau",
-  "modprobe.blacklist=nouveau",
-  "nvidia-drm.modeset=1",
-  "nvidia-drm.fbdev=1"
-]
diff --git a/files/scripts/install-intellij.sh b/files/scripts/install-intellij.sh
deleted file mode 100644
index 0579f93..0000000
--- a/files/scripts/install-intellij.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -eou pipefail
-
-# Version number
-VERSION="2023.1.2"
-
-# Download https://download.jetbrains.com/idea/ideaIC-${VERSION}.tar.gz
-curl -L -o /tmp/ideaIC-${VERSION}.tar.gz https://download.jetbrains.com/idea/ideaIC-${VERSION}.tar.gz
-
-# Extract to /usr/opt
-mkdir -p /usr/opt
-tar -xzf /tmp/ideaIC-${VERSION}.tar.gz -C /usr/opt
-
-# Find the full path to the IntelliJ directory
-IDEA_PATH=$(ls -d /usr/opt/idea-IC-*)
-
-# Create .desktop file
-cat > /tmp/intellij.desktop <<EOL
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=IntelliJ IDEA Community Edition
-Icon=$IDEA_PATH/bin/idea.png
-Exec="$IDEA_PATH/bin/idea.sh" %f
-Terminal=false
-Categories=Development;IDE;
-EOL
-
-# Make the application available to all users
-sudo mv /tmp/intellij.desktop /usr/share/applications/
diff --git a/files/scripts/install-rubymine.sh b/files/scripts/install-rubymine.sh
deleted file mode 100644
index 9454a63..0000000
--- a/files/scripts/install-rubymine.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -eou pipefail
-
-# Version number
-VERSION="2023.1.2"
-
-# Download https://download.jetbrains.com/ruby/RubyMine-2023.1.2.tar.gz
-curl -L -o /tmp/RubyMine-${VERSION}.tar.gz https://download.jetbrains.com/ruby/RubyMine-${VERSION}.tar.gz
-
-# Extract to /usr/opt
-mkdir -p /usr/opt
-tar -xzf /tmp/RubyMine-${VERSION}.tar.gz -C /usr/opt
-
-# Find the full path to the RubyMine directory
-RUBYMINE_PATH=$(ls -d /usr/opt/RubyMine-*)
-
-# Create .desktop file
-cat > /tmp/rubymine.desktop <<EOL
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=RubyMine
-Icon=$RUBYMINE_PATH/bin/rubymine.png
-Exec="$RUBYMINE_PATH/bin/rubymine.sh" %f
-Terminal=false
-Categories=Development;IDE;
-EOL
-
-# Make the application available to all users
-sudo mv /tmp/rubymine.desktop /usr/share/applications/
\ No newline at end of file
diff --git a/justfile b/justfile
index 9812cd0..2da1fc7 100644
--- a/justfile
+++ b/justfile
@@ -1,5 +1,8 @@
 export BB_REGISTRY := "registry.gitlab.com"
 export BB_REGISTRY_NAMESPACE := "wunker-bunker/wunker-os"
+export BB_GENISO_SECURE_BOOT_URL := "https://gitlab.com/wunker-bunker/wunker-os/-/raw/main/files/base/etc/pki/akmods/certs/akmods-wunker-bunker.der"
+export BB_GENISO_ENROLLMENT_PASSWORD := "wunker"
+export BB_GENISO_VARIANT := "kinoite"
 
 generate-iso recipe tag="latest":
     #!/usr/bin/env nu
@@ -15,7 +18,6 @@ generate-iso recipe tag="latest":
         generate-iso
         --iso-name $'($name).iso'
         --output-dir .iso/
-        --variant kinoite
         image $image)
 
 generate-secureboot-key:
diff --git a/recipes/base/nvidia.yml b/recipes/base/nvidia.yml
index 640e0d9..f03fa71 100644
--- a/recipes/base/nvidia.yml
+++ b/recipes/base/nvidia.yml
@@ -19,6 +19,12 @@ modules:
     files:
       - source: nvidia
         destination: /
+  - type: kargs
+    kargs:
+      - rd.driver.blacklist=nouveau
+      - modprobe.blacklist=nouveau
+      - nvidia-drm.modeset=1
+      - nvidia-drm.fbdev=1
   - type: script
     snippets:
       - cp /usr/lib/modprobe.d/nvidia-modeset.conf /etc/modprobe.d/nvidia-modeset.conf
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index ed839ff..355fb17 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -26,6 +26,10 @@ stages:
 modules:
   - from-file: common/jp-desktop.yml
   - from-file: common/helix.yml
+  - type: dnf
+    install:
+      packages:
+        - ramalama
   # - type: copy
   #   from: cosmic-comp
   #   src: /out/cosmic-comp
diff --git a/recipes/wke-fw-desktop.yml b/recipes/wke-fw-desktop.yml
new file mode 100644
index 0000000..674ba73
--- /dev/null
+++ b/recipes/wke-fw-desktop.yml
@@ -0,0 +1,19 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+name: wke
+base-image: registry.gitlab.com/wunker-bunker/wunker-os/base
+image-version: 42
+description: The image of Wunker OS for RKE2 Worker
+alt-tags:
+  - fw-desktop
+modules:
+  - type: kargs
+    kargs:
+      - amd_iommu=off
+      - amdttm.pages_limit=27648000
+      - amdttm.page_pool_size=13824000
+  - from-file: common/wke.yml
+  - type: script
+    snippets:
+      - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh
+  - from-file: common/post-build.yml