diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
index 36e69738a2..58d34cc3c3 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -2050,6 +2050,8 @@ module VCenterDriver
 
                 # Add vCenter template name
                 new_template.update("VCENTER_TEMPLATE_NAME=#{@item.name}", true)
+
+                new_template.unlock()
         end
 
         def resize_unmanaged_disks
diff --git a/src/vmm_mad/remotes/vcenter/deploy b/src/vmm_mad/remotes/vcenter/deploy
index 3504edc6f3..f19aaac376 100755
--- a/src/vmm_mad/remotes/vcenter/deploy
+++ b/src/vmm_mad/remotes/vcenter/deploy
@@ -65,6 +65,13 @@ begin
         vm = VCenterDriver::VirtualMachine.new_from_clone(vi_client,
                                                           drv_action,
                                                           vm_id)
+        if vm.instantiated_as_persistent?
+            template_id = vm.one_item['TEMPLATE/TEMPLATE_ID']
+            vm_template = OpenNebula::Template.new_with_id(template_id, OpenNebula::Client.new)
+            rc = vm_template.info()
+            raise if OpenNebula.is_error?(rc)
+            vm_template.lock(1)
+        end
     end
 
     if vm.is_powered_off?