diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 79a24eb..5c1f968 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,3 +1,6 @@
+## 0.13.0
+- changed an approach to distribute tags as attributes for suite and test entities
+
 ## 0.12.0
 - added support of named attachments
 
diff --git a/index.js b/index.js
index d65bfc2..662f221 100644
--- a/index.js
+++ b/index.js
@@ -84,6 +84,7 @@ class RPFormatter extends Formatter {
         if (!this.features[featureName]) {
             await retry(async () => {
                 const featureItem = this.rpClient.startTestItem({
+                    attributes: this.prepareTags(testCase.gherkinDocument.feature.tags),
                     description:
                         this.formatTags(testCase.gherkinDocument.feature.tags) +
                         '\n' +
@@ -123,7 +124,7 @@ class RPFormatter extends Formatter {
                 name: testCase.pickle.name,
                 startTime,
                 type: 'STEP',
-                attributes,
+                attributes: [...attributes, ...this.prepareTags(testCase.pickle.tags) ],
                 retry: retryTest
             }, this.launchId, featureTempId);
             await testItem.promise;
@@ -242,6 +243,9 @@ class RPFormatter extends Formatter {
 
     formatTags(tags) {
         return tags.map(tag => '<code>' + tag.name + '</code>').join('')
+        
+    prepareTags(tags) {
+        return tags.map(tag => tag.name)
     }
 
     prepareContent(attachment) {
diff --git a/package.json b/package.json
index 19953c9..c1e52e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qavajs/format-report-portal",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "cucumber formatter for report portal",
   "main": "index.js",
   "scripts": {