diff --git a/lib/abf_worker/build_lists_publish_task_manager.rb b/lib/abf_worker/build_lists_publish_task_manager.rb
index 789d5791c..6869edbfa 100644
--- a/lib/abf_worker/build_lists_publish_task_manager.rb
+++ b/lib/abf_worker/build_lists_publish_task_manager.rb
@@ -94,12 +94,13 @@ module AbfWorker
 
         distrib_type  = build_list.build_for_platform.distrib_type
         cmd_params    = {
-          'RELEASED'        => false,
-          'REPOSITORY_NAME' => build_list.save_to_repository.name,
-          'TYPE'            => distrib_type,
-          'IS_CONTAINER'    => true,
-          'ID'              => build_list.id,
-          'PLATFORM_NAME'   => build_list.save_to_platform.name
+          'RELEASED'            => false,
+          'REPOSITORY_NAME'     => build_list.save_to_repository.name,
+          'TYPE'                => distrib_type,
+          'IS_CONTAINER'        => true,
+          'ID'                  => build_list.id,
+          'SAVE_TO_PLATFORM'    => build_list.save_to_platform.name,
+          'BUILD_FOR_PLATFORM'  => build_list.build_for_platform.name
         }.map{ |k, v| "#{k}=#{v}" }.join(' ')
 
 
@@ -284,9 +285,11 @@ module AbfWorker
 
       distrib_type  = build_for_platform.distrib_type
       cmd_params    = {
-        'RELEASED'        => save_to_platform.released,
-        'REPOSITORY_NAME' => save_to_repository.name,
-        'TYPE'            => distrib_type
+        'RELEASED'            => save_to_platform.released,
+        'REPOSITORY_NAME'     => save_to_repository.name,
+        'TYPE'                => distrib_type,
+        'SAVE_TO_PLATFORM'    => save_to_platform.name,
+        'BUILD_FOR_PLATFORM'  => build_for_platform.name
       }.map{ |k, v| "#{k}=#{v}" }.join(' ')
 
       lock_str  = "#{save_to_repository_id}-#{build_for_platform_id}"
@@ -334,6 +337,7 @@ module AbfWorker
       return true
     end
 
+    # Only for main platforms!
     def create_tasks_for_repository_regenerate_metadata
       worker_queue = 'publish_worker_default'
       worker_class   = 'AbfWorker::PublishWorkerDefault'
@@ -348,10 +352,12 @@ module AbfWorker
         platform_path = "#{rep.platform.path}/repository"
         distrib_type  = rep.platform.distrib_type
         cmd_params    = {
-          'RELEASED'        => rep.platform.released,
-          'REPOSITORY_NAME' => rep.name,
-          'TYPE'            => distrib_type,
-          'REGENERATE_METADATA' => true
+          'RELEASED'            => rep.platform.released,
+          'REPOSITORY_NAME'     => rep.name,
+          'TYPE'                => distrib_type,
+          'REGENERATE_METADATA' => true,
+          'SAVE_TO_PLATFORM'    => rep.platform.name,
+          'BUILD_FOR_PLATFORM'  => rep.platform.name
         }.map{ |k, v| "#{k}=#{v}" }.join(' ')
 
         options = {