diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 7520ecd254..eb24e950a9 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -665,12 +665,12 @@ EOT
             end
         end
 
-        private
-
         def retrieve_resource(id)
             factory(id)
         end
 
+        private
+
         def pool_to_array(pool)
             if !pool.instance_of?(Hash)
                 phash = pool.to_hash
diff --git a/src/cli/onecluster b/src/cli/onecluster
index 756cc741e0..419d8c167e 100755
--- a/src/cli/onecluster
+++ b/src/cli/onecluster
@@ -194,6 +194,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onedatastore b/src/cli/onedatastore
index 7d231b556c..266fb95a5e 100755
--- a/src/cli/onedatastore
+++ b/src/cli/onedatastore
@@ -171,6 +171,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onegroup b/src/cli/onegroup
index 81ab047329..dae495d013 100755
--- a/src/cli/onegroup
+++ b/src/cli/onegroup
@@ -130,6 +130,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onehost b/src/cli/onehost
index 1c886e1be4..f62891ff2a 100755
--- a/src/cli/onehost
+++ b/src/cli/onehost
@@ -174,6 +174,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/oneimage b/src/cli/oneimage
index 567f1c0b46..ea5b07b94f 100755
--- a/src/cli/oneimage
+++ b/src/cli/oneimage
@@ -223,6 +223,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onesecgroup b/src/cli/onesecgroup
index 703d25aa43..7818f147b7 100755
--- a/src/cli/onesecgroup
+++ b/src/cli/onesecgroup
@@ -166,6 +166,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index 9a0cde0285..2728f0fa5d 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -293,6 +293,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/oneuser b/src/cli/oneuser
index dc7c0eb944..6b9586d664 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -210,6 +210,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onevdc b/src/cli/onevdc
index 3ccc71edc5..b0c2ba205d 100755
--- a/src/cli/onevdc
+++ b/src/cli/onevdc
@@ -148,6 +148,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onevm b/src/cli/onevm
index 270311d217..35cc28e988 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -263,6 +263,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1], 'USER_TEMPLATE')
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
diff --git a/src/cli/onevnet b/src/cli/onevnet
index 5268bc1864..a79cbde240 100755
--- a/src/cli/onevnet
+++ b/src/cli/onevnet
@@ -329,6 +329,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
@@ -365,6 +368,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             str = OpenNebulaHelper.update_template_helper(false, args[0], obj,
                 args[2], "AR_POOL", false)
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update_ar(str)
         end
     end
diff --git a/src/cli/onezone b/src/cli/onezone
index 4bd27ac51d..ae95c642b0 100755
--- a/src/cli/onezone
+++ b/src/cli/onezone
@@ -105,6 +105,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end