diff --git a/Makefile b/Makefile
index fba181c8..1941bd37 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,15 @@ add-idols-ssh-key:
 idols: add-idols-ssh-key
 	colmena apply --on '@dist-build'
 
+aqua:
+	colmena apply --on '@aqua'
+
+ruby:
+	colmena apply --on '@ruby'
+
+kana:
+	colmena apply --on '@kana'
+
 idols-debug: add-idols-ssh-key
 	colmena apply --on '@dist-build' --verbose --show-trace
 
@@ -91,6 +100,11 @@ roll: add-idols-ssh-key
 roll-debug: add-idols-ssh-key
 	colmena apply --on '@dist-build' --verbose --show-trace
 
+nozomi:
+	colmena apply --on '@nozomi'
+
+yukina:
+	colmena apply --on '@yukina'
 
 ############################################################################
 #
diff --git a/flake.nix b/flake.nix
index c08b0eec..bc35b730 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,7 @@
       ];
       home-module = import ./home/linux/server.nix;
     };
-    idol_aquamarine_tags = ["dist-build"];
+    idol_aquamarine_tags = ["dist-build" "aqua"];
 
     # 星野 瑠美衣, Hoshino Rubii
     idol_ruby_modules = {
@@ -68,7 +68,7 @@
       ];
       home-module = import ./home/linux/server.nix;
     };
-    idol_ruby_tags = ["dist-build"];
+    idol_ruby_tags = ["dist-build" "ruby"];
 
     # 有馬 かな, Arima Kana
     idol_kana_modules = {
@@ -77,7 +77,7 @@
       ];
       home-module = import ./home/linux/server.nix;
     };
-    idol_kana_tags = ["dist-build"];
+    idol_kana_tags = ["dist-build" "kana"];
 
     # 森友 望未, Moritomo Nozomi
     rolling_nozomi_modules = {
@@ -86,7 +86,7 @@
       ];
       # home-module = import ./home/linux/server-riscv64.nix;
     };
-    rolling_nozomi_tags = ["riscv"];
+    rolling_nozomi_tags = ["riscv" "nozomi"];
 
     # 小坂 結季奈, Kosaka Yukina
     rolling_yukina_modules = {
@@ -95,7 +95,7 @@
       ];
       # home-module = import ./home/linux/server-riscv64.nix;
     };
-    rolling_yukina_tags = ["riscv"];
+    rolling_yukina_tags = ["riscv" "yukina"];
 
     x64_specialArgs =
       {
@@ -155,11 +155,11 @@
 
         nodeSpecialArgs = {
           nozomi = lpi4a_specialArgs;
-          # yukina = lpi4a_specialArgs;
+          yukina = lpi4a_specialArgs;
         };
         nodeNixpkgs = {
           nozomi = lpi4a_pkgs;
-          # yukina = lpi4a_pkgs;
+          yukina = lpi4a_pkgs;
         };
       };
 
@@ -170,7 +170,7 @@
 
       # riscv64 SBCs
       nozomi = colemnaSystem (rolling_nozomi_modules // lpi4a_base_args // { host_tags = rolling_nozomi_tags; });
-      # yukina = colemnaSystem (rolling_yukina_modules // lpi4a_base_args // { host_tags = rolling_yukina_tags; });
+      yukina = colemnaSystem (rolling_yukina_modules // lpi4a_base_args // { host_tags = rolling_yukina_tags; });
     };
 
     # take system images for idols