diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 138bfc3bd0..3c9dce4fd6 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -417,8 +417,8 @@ EOT
                 else
                     sync = true
                 end
-
-                @@client=OpenNebula::Client.new(secret, endpoint, :sync => sync)
+                options[:sync] = sync
+                @@client=OpenNebula::Client.new(secret, endpoint, options)
             end
         end
 
diff --git a/src/cli/one_helper/onezone_helper.rb b/src/cli/one_helper/onezone_helper.rb
index 8a1f0212ab..aef3c644c9 100644
--- a/src/cli/one_helper/onezone_helper.rb
+++ b/src/cli/one_helper/onezone_helper.rb
@@ -124,7 +124,8 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
 
                 next if endpoint.nil?
 
-                client = OpenNebula::Client.new(nil, endpoint)
+                options[:timeout] = 5 #5 sec
+                client = OpenNebula::Client.new(nil, endpoint, options)
 
                 xml_doc = client.call("zone.raftstatus")
 
diff --git a/src/cli/oneshowback b/src/cli/oneshowback
index faae345c40..425934fe28 100755
--- a/src/cli/oneshowback
+++ b/src/cli/oneshowback
@@ -43,6 +43,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
     helper=OpenNebulaHelper::OneHelper.new
 
     before_proc do
+        options[:timeout] = 60 #60 sec
         helper.set_client(options)
     end