diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01cb17b9f..6e1d4cc20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+# 5.0.2
+* Fix an issue where custom tags (tag1) were overridden by default tags
+  
 # 5.0.1
 * Fix an issue with configurable product prices being zero in Nosto product data when taxes are included in display prices
 
diff --git a/Model/Product/Builder.php b/Model/Product/Builder.php
index ace9d2230..f4416ecce 100644
--- a/Model/Product/Builder.php
+++ b/Model/Product/Builder.php
@@ -225,7 +225,6 @@ public function build(
             }
             $nostoProduct->setCustomFields($this->getCustomFieldsWithAttributes($product, $store));
             // Update customised Tag1, Tag2 and Tag3
-            $this->amendAttributeTags($product, $nostoProduct, $store);
             if ($this->getDataHelper()->isAltimgTaggingEnabled($store)) {
                 $nostoProduct->setAlternateImageUrls($this->buildAlternativeImages($product, $store));
             }
@@ -245,6 +244,7 @@ public function build(
             if (($tags = $this->buildDefaultTags($product, $store)) !== []) {
                 $nostoProduct->setTag1($tags);
             }
+            $this->amendAttributeTags($product, $nostoProduct, $store);
             $brandAttribute = $this->getDataHelper()->getBrandAttribute($store);
             if ($product->hasData($brandAttribute)) {
                 $nostoProduct->setBrand(
diff --git a/composer.json b/composer.json
index e17cee1f1..24f85caf1 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "require-dev": {
     "php": ">=7.1.0",
     "phpmd/phpmd": "^2.5",
diff --git a/etc/module.xml b/etc/module.xml
index 943e505ab..6786bbbac 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="5.0.1"/>
+    <module name="Nosto_Tagging" setup_version="5.0.2"/>
 </config>