diff --git a/create_gpt_image.py b/create_gpt_image.py
index 16ad850..33554f9 100755
--- a/create_gpt_image.py
+++ b/create_gpt_image.py
@@ -520,6 +520,7 @@ def write(self, img_file, offset, entry_info):
                       'mfos':'4f33cfe4-a0c1-448b-aec4-40f10a0cef3f',
                       'teedata': '0fc63daf-8483-4772-8e79-3d69d8477de4',
                       'super': '0fc63daf-8483-4772-8e79-3d69d8477de4',
+                      'share_data': '0fc63daf-8483-4772-8e79-3d69d8477de4',
                       'reserved': '0fc63daf-8483-4772-8e79-3d69d8477de4'
                       }
             }
@@ -876,6 +877,7 @@ class GPTImage(object):
         'mfos',
         'teedata',
         'super',
+        'share_data',
         'reserved'
         ]
 
diff --git a/tasks/flashfiles.mk b/tasks/flashfiles.mk
index ce2c179..2a161d9 100755
--- a/tasks/flashfiles.mk
+++ b/tasks/flashfiles.mk
@@ -297,7 +297,7 @@ LOCAL_TOOL:= \
 ifeq ($(RELEASE_BUILD),true)
 flashfiles: $(INTEL_FACTORY_FLASHFILES_TARGET) $(BUILT_RELEASE_FLASH_FILES_PACKAGE) $(gpt_name) publish_mkdir_dest publish_vertical host-pkg
 	@$(ACP) $(BUILT_RELEASE_FLASH_FILES_PACKAGE) $(publish_dest)
-ifeq (,$(filter apollo_ivi blizzard_ivi celadon_ivi,$(TARGET_PRODUCT)))
+ifeq (,$(filter blizzard_ivi,$(TARGET_PRODUCT)))
 	@echo "Publishing Release files started ..."
 	$(hide) mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release_Files
 	$(hide) cp -r $(PRODUCT_OUT)/*-flashfiles-*.zip $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release_Files
@@ -346,7 +346,7 @@ else
 endif
 else
 flashfiles: $(INTEL_FACTORY_FLASHFILES_TARGET) publish_gptimage_var publish_mkdir_dest publish_vertical host-pkg
-ifeq (,$(filter apollo_ivi blizzard_ivi celadon_ivi,$(TARGET_PRODUCT)))
+ifeq (,$(filter blizzard_ivi,$(TARGET_PRODUCT)))
 	@echo "Publishing Release files started"
 	$(hide) mkdir -p $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release_Files
 	$(hide) cp -r $(PRODUCT_OUT)/*-flashfiles-*.zip $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT)/Release_Files