diff --git a/src/oneprovision/lib/provision/provision.rb b/src/oneprovision/lib/provision/provision.rb
index cdf093523f..c31c013e54 100644
--- a/src/oneprovision/lib/provision/provision.rb
+++ b/src/oneprovision/lib/provision/provision.rb
@@ -324,8 +324,6 @@ module OneProvision
 
                 self.state = STATE['RUNNING']
 
-                add_provision_id
-
                 update
 
                 self['ID']
@@ -907,23 +905,6 @@ module OneProvision
             end
         end
 
-        # Add provision ID into objects template to improve search operations
-        def add_provision_id
-            objects.each do |key, value|
-                value.each do |obj|
-                    resource = Resource.object(key)
-                    resource.info(obj['id'])
-
-                    if key != 'flowtemplates'
-                        resource.one.update("PROVISION_ID=#{self['ID']}", true)
-                    else
-                        resource.one.update("{\"PROVISION_ID\":#{self['ID']}}",
-                                            true)
-                    end
-                end
-            end
-        end
-
     end
 
 end
diff --git a/src/oneprovision/lib/provision/resources/virtual/marketplaceapp.rb b/src/oneprovision/lib/provision/resources/virtual/marketplaceapp.rb
index 3207f8e096..7b0f41bd5a 100644
--- a/src/oneprovision/lib/provision/resources/virtual/marketplaceapp.rb
+++ b/src/oneprovision/lib/provision/resources/virtual/marketplaceapp.rb
@@ -88,10 +88,14 @@ module OneProvision
 
             # get new created image and update it with provision ID
             @image = Image.new
+            p_id   = @p_template['provision']['id']
 
             @image.info(image_id)
             @image.update_provision_info({ 'wait'         => wait,
-                                           'wait_timeout' => timeout })
+                                           'wait_timeout' => timeout,
+                                           'id'           => p_id })
+
+            @template.update_provision_info({ 'id' => p_id })
 
             # Change permissions and ownership
             @image.template_chown(@p_template)