diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c417c24..5c16518 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,8 @@ build-image:
           - cp-laptop.yml
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
-          - jp-minis.yml
+          - jp-minis-server.yml
+          - jp-minis-client.yml
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
diff --git a/recipes/jp-minis.yml b/recipes/common/jp-minis.yml
similarity index 73%
rename from recipes/jp-minis.yml
rename to recipes/common/jp-minis.yml
index db85f3d..54b76bd 100644
--- a/recipes/jp-minis.yml
+++ b/recipes/common/jp-minis.yml
@@ -1,10 +1,3 @@
----
-# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
-name: jp-minis
-# base-image: ghcr.io/ublue-os/kinoite-nvidia
-base-image: ghcr.io/ublue-os/base-main
-image-version: 42
-description: The image of Wunker OS for JP's Minisforum PCs.
 modules:
   - from-file: common/common.yml
   - type: dnf
@@ -39,4 +32,3 @@ modules:
   - from-file: common/updates.yml
   - from-file: common/bluebuild-logo.yml
   - from-file: common/jp-chezmoi.yml
-  - from-file: common/post-build.yml
diff --git a/recipes/jp-minis-client.yml b/recipes/jp-minis-client.yml
new file mode 100644
index 0000000..63ba8ad
--- /dev/null
+++ b/recipes/jp-minis-client.yml
@@ -0,0 +1,16 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+name: jp-minis
+# base-image: ghcr.io/ublue-os/kinoite-nvidia
+base-image: ghcr.io/ublue-os/base-main
+image-version: 42
+description: The image of Wunker OS for JP's Minisforum PCs.
+alt-tags:
+  - client
+modules:
+  - from-file: common/jp-minis.yml
+  - type: systemd
+    system:
+      enabled:
+        - rke2-agent.service
+  - from-file: common/post-build.yml
diff --git a/recipes/jp-minis-server.yml b/recipes/jp-minis-server.yml
new file mode 100644
index 0000000..9ec15db
--- /dev/null
+++ b/recipes/jp-minis-server.yml
@@ -0,0 +1,16 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+name: jp-minis
+# base-image: ghcr.io/ublue-os/kinoite-nvidia
+base-image: ghcr.io/ublue-os/base-main
+image-version: 42
+description: The image of Wunker OS for JP's Minisforum PCs.
+alt-tags:
+  - server
+modules:
+  - from-file: common/jp-minis.yml
+  - type: systemd
+    system:
+      enabled:
+        - rke2-server.service
+  - from-file: common/post-build.yml