diff --git a/lib/kadeploy3/client/client.rb b/lib/kadeploy3/client/client.rb
index c6e29bab7d06d1fbf5081ae30b002eb2ec4e2ddb..7280ce77558a7b6b2323afa0607a0c9d20b357b1 100644
--- a/lib/kadeploy3/client/client.rb
+++ b/lib/kadeploy3/client/client.rb
@@ -873,7 +873,7 @@ class Client
     # Check that every nodes was treated
     error("The nodes #{(options[:nodes] - treated).join(", ")} does not belongs to any server") if options[:nodes] and treated.sort != options[:nodes].sort
 
-    unless options[:env_arch] || nodes.nil?
+    unless options[:env_arch] || nodes.nil? || options[:command] == 'karight' # karight can be apply on node with different arch
       default_arch.uniq!
       error("Selected nodes have a different default architecture. You must specify the architecture to use with --env-arch.") if default_arch.count != 1
       options[:env_arch] = default_arch.first
diff --git a/sbin/karights3 b/sbin/karights3
index 0e8ae22c25b178615f089d231cb7798b8c888db7..ca4d99909677d80be31d9c16b288dd2f9cad17f3 100755
--- a/sbin/karights3
+++ b/sbin/karights3
@@ -32,6 +32,7 @@ class KarightsClient < Client
         :user => nil,
         :parts => [],
         :overwrite => false,
+        :command => 'karight',
         :json => false,
       }
     )