diff --git a/e2e/e2e-config/utils/build-number.js b/e2e/e2e-config/utils/build-number.js
new file mode 100644
index 000000000..0b2cb9f57
--- /dev/null
+++ b/e2e/e2e-config/utils/build-number.js
@@ -0,0 +1,10 @@
+const buildNumber = () => {
+    let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
+    if (!buildNumber) {
+        process.env.TRAVIS_BUILD_NUMBER = Date.now();
+    }
+
+    return process.env.TRAVIS_BUILD_NUMBER;
+}
+
+module.exports = buildNumber;
diff --git a/e2e/e2e-config/utils/upload-output.js b/e2e/e2e-config/utils/upload-output.js
index 6bd0236c0..5d9b88ae3 100644
--- a/e2e/e2e-config/utils/upload-output.js
+++ b/e2e/e2e-config/utils/upload-output.js
@@ -1,112 +1,65 @@
-const fs = require('fs');
 const path = require('path');
+const fs = require('fs');
 const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility;
+const buildNumber = require('./build-number');
+const outputDir = path.resolve(__dirname, '../../../e2e-output/');
 
-function buildNumber() {
-  let buildNumber = process.env.TRAVIS_BUILD_NUMBER;
-  if (!buildNumber) {
-    process.env.TRAVIS_BUILD_NUMBER = Date.now();
-  }
+uploadOutput = async function (retryCount = 1) {
+  await saveScreenshots(retryCount);
+};
 
-  return process.env.TRAVIS_BUILD_NUMBER;
-}
-
-async function uploadScreenshot(retryCount) {
-  console.log(`Start uploading report ${retryCount} on ${process.env.SCREENSHOT_URL}`);
+async function saveScreenshots(retryCount) {
+  const folderName = process.env.TRAVIS_JOB_NAME.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+  console.log(`Start uploading report in ${folderName}`);
 
   let alfrescoJsApi = new AlfrescoApi({
     provider: 'ECM',
     hostEcm: process.env.SCREENSHOT_URL
   });
 
-  try {
-    await alfrescoJsApi.login(process.env.SCREENSHOT_USERNAME, process.env.SCREENSHOT_PASSWORD);
-  } catch (error) {
-    console.log(` ---- Upload output - login failed : ${error}`);
-  }
+  await alfrescoJsApi.login(process.env.SCREENSHOT_USERNAME, process.env.SCREENSHOT_PASSWORD);
 
   let folderNode;
 
-  const screenshotSavePath = `Builds/ACA/${buildNumber()}/${process.env.TRAVIS_JOB_NAME.replace(/[^a-z0-9]/gi, '_').toLowerCase()}`;
-
   try {
     folderNode = await alfrescoJsApi.nodes.addNode('-my-', {
       'name': `retry-${retryCount}`,
-      'relativePath': screenshotSavePath,
+      'relativePath': `Builds/ACA-${buildNumber()}/${folderName}/`,
       'nodeType': 'cm:folder'
     }, {}, {
       'overwrite': true
     });
   } catch (error) {
-    console.log(`--- Upload output - add node failed. Maybe already exists. ${error}`);
-    try {
-      console.log('--- trying to get the Builds folder ');
-      folderNode = await alfrescoJsApi.nodes.getNode('-my-', {
-        'relativePath': `${screenshotSavePath}/retry-${retryCount}`,
-        'nodeType': 'cm:folder'
-      }, {}, {
-        'overwrite': true
-      });
-    } catch (error) {
-      console.log(`--- Upload out - get node failed. ${error}`);
-    }
+    folderNode = await alfrescoJsApi.nodes.getNode('-my-', {
+      'relativePath': `Builds/ACA-${buildNumber()}/${folderName}/retry-${retryCount}`,
+      'nodeType': 'cm:folder'
+    }, {}, {
+      'overwrite': true
+    });
   }
 
-  const screenShotsPath = path.resolve(__dirname, '../../../e2e-output/screenshots/');
-  let files = fs.readdirSync(screenShotsPath);
-
-  try {
-    for (const fileName of files) {
-      let pathFile = path.join(screenShotsPath, fileName);
-      let file = fs.createReadStream(pathFile);
-
-      let safeFileName = fileName.replace(new RegExp('"', 'g'), '');
-
-      await alfrescoJsApi.upload.uploadFile(
-        file,
-        '',
-        folderNode.entry.id,
-        null,
-        {
-          name: safeFileName,
-          nodeType: 'cm:content',
-          autoRename: true,
-        }
-      );
-    }
-  } catch (error) {
-    console.log(`Upload failed: ${error}`);
-  }
-
-  fs.renameSync(path.resolve(__dirname, '../../../e2e-output/'), path.resolve(__dirname, `../../e2e-output-${retryCount}/`))
+  fs.renameSync(outputDir, path.join(`${outputDir}-${folderName}-${retryCount}/`));
 
   const child_process = require("child_process");
-  child_process.execSync(` tar -czvf ../e2e-result-${process.env.TRAVIS_JOB_NUMBER}-${retryCount}.tar .`, {
-    cwd: path.resolve(__dirname, `../../e2e-output-${retryCount}/`)
+  child_process.execSync(` tar -czvf ../e2e-result-${folderName}-${retryCount}.tar .`, {
+    cwd: `${outputDir}-${folderName}-${retryCount}/`
   });
 
-  let pathFile = path.join(__dirname, `../../e2e-result-${process.env.TRAVIS_JOB_NUMBER}-${retryCount}.tar`);
+  let pathFile = path.join(outputDir, `../e2e-result-${folderName}-${retryCount}.tar`);
+
   let file = fs.createReadStream(pathFile);
+  await alfrescoJsApi.upload.uploadFile(
+    file,
+    '',
+    folderNode.entry.id,
+    null,
+    {
+      'name': `e2e-result-${folderName}-${retryCount}.tar`,
+      'nodeType': 'cm:content',
+      'autoRename': true
+    }
+  );
 
-  try {
-    await alfrescoJsApi.upload.uploadFile(
-      file,
-      '',
-      folderNode.entry.id,
-      null,
-      {
-        'name': `e2e-result-${process.env.TRAVIS_JOB_NUMBER}-${retryCount}.tar`,
-        'nodeType': 'cm:content',
-        'autoRename': true
-      }
-    );
-  } catch (error) {
-    throw new Error(`--- Upload output failed. ${error}`);
-  }
-
-  fs.rmdirSync(path.resolve(__dirname, `../../e2e-output-${retryCount}/`), { recursive: true });
 }
 
-module.exports = {
-  uploadScreenshot: uploadScreenshot
-};
+module.exports = uploadOutput;
diff --git a/projects/aca-shared/src/lib/services/app.extension.service.ts b/projects/aca-shared/src/lib/services/app.extension.service.ts
index 5239f77b9..2c99ed415 100644
--- a/projects/aca-shared/src/lib/services/app.extension.service.ts
+++ b/projects/aca-shared/src/lib/services/app.extension.service.ts
@@ -278,9 +278,9 @@ export class AppExtensionService implements RuleContext {
     presets = this.filterDisabled(mergeObjects(presets, ...elements));
 
     try {
-      this.appConfig.config['content-metadata'] = { presets };
+      this.appConfig.config['content-metadata'].presets = presets;
     } catch (error) {
-      this.logger.error(error, '- could not change content-metadata from app.config -');
+      this.logger.error(error, '- could not change content-metadata presets from app.config -');
     }
 
     return { presets };
diff --git a/protractor.conf.js b/protractor.conf.js
index 67c9c5980..7eac8d322 100755
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -4,11 +4,8 @@
 require('dotenv').config({ path: process.env.ENV_FILE });
 const path = require('path');
 const { SpecReporter } = require('jasmine-spec-reporter');
-const fs = require('fs');
-const resolve = require('path').resolve;
-const logger = require('./tools/helpers/logger');
 const retry = require('protractor-retry-angular-cli').retry;
-const { uploadScreenshot } = require('./e2e/e2e-config/utils/upload-output');
+const { uploadOutput } = require('./e2e/e2e-config/utils/upload-output');
 const smartRunnerFactory = require('./e2e/smartrunner-factory');
 
 const projectRoot = path.resolve(__dirname);
@@ -206,19 +203,24 @@ exports.config = {
 
   afterLaunch: async function (statusCode) {
     if (SAVE_SCREENSHOT && statusCode !== 0) {
-      console.log(`Save screenshot is ${SAVE_SCREENSHOT}, trying to save screenshots.`);
+      console.log(`Status code is ${statusCode}, trying to save screenshots.`);
+      let retryCount = 1;
+      if (argv.retry) {
+        retryCount = ++argv.retry;
+      }
 
       try {
-        await uploadScreenshot(1);
+        await uploadOutput(retryCount);
         console.log('Screenshots saved successfully.');
       } catch (e) {
         console.log('Error happened while trying to upload screenshots and test reports: ', e);
       }
     } else {
-      console.log(`Save screenshot is ${SAVE_SCREENSHOT}, no need to save screenshots.`);
+      console.log(`Status code is ${statusCode}, no need to save screenshots.`);
     }
+
     if (process.env.CI) {
-      return retry.afterLaunch(MAX_RETRIES);
+      return retry.afterLaunch(process.env.RETRY_COUNT || 4, statusCode);
     }
   }
 };
diff --git a/src/app.config.json b/src/app.config.json
index 224596c24..80f34821b 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -185,7 +185,9 @@
           ]
         }
       ]
-    }
+    },
+    "multi-value-pipe-separator": ", ",
+    "multi-value-chips": true
   },
   "search": {
     "filterWithContains": true,
diff --git a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
index 7d053c13b..97f4f4c0e 100644
--- a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
+++ b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
@@ -40,6 +40,12 @@ describe('MetadataTabComponent', () => {
   let store: Store<AppState>;
   let appConfig: AppConfigService;
   let extensions: AppExtensionService;
+  const presets = {
+    default: {
+      includeAll: true
+    },
+    custom: []
+  };
 
   setupTestBed({
     imports: [CoreModule, AppTestingModule, ContentMetadataModule],
@@ -54,25 +60,24 @@ describe('MetadataTabComponent', () => {
     beforeEach(() => {
       appConfig = TestBed.inject(AppConfigService);
       extensions = TestBed.inject(AppExtensionService);
+      appConfig.config['content-metadata'] = { presets };
     });
 
     it('should remain unchanged when metadata extension is missing', () => {
-      appConfig.config['content-metadata'] = 'initial config';
       extensions.contentMetadata = null;
 
       fixture = TestBed.createComponent(MetadataTabComponent);
 
-      expect(appConfig.config['content-metadata']).toEqual('initial config');
+      expect(appConfig.config['content-metadata'].presets).toEqual(presets);
     });
 
     it('should be overwritten by the one from extension', () => {
-      appConfig.config['content-metadata'] = 'initial config';
-      extensions.contentMetadata = [{ 'new config': true }];
+      extensions.contentMetadata = { presets: [{ 'new config': true }] };
 
       fixture = TestBed.createComponent(MetadataTabComponent);
 
-      expect(appConfig.config['content-metadata']).not.toEqual('initial config');
-      expect(appConfig.config['content-metadata']).toEqual(extensions.contentMetadata);
+      expect(appConfig.config['content-metadata'].presets).not.toEqual(presets);
+      expect(appConfig.config['content-metadata'].presets).toEqual(extensions.contentMetadata.presets);
     });
   });
 
diff --git a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
index 786bdbf30..153750d2d 100644
--- a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
+++ b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
@@ -59,7 +59,7 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
     private contentMetadataService: ContentMetadataService
   ) {
     if (this.extensions.contentMetadata) {
-      this.appConfig.config['content-metadata'] = this.extensions.contentMetadata;
+      this.appConfig.config['content-metadata'].presets = this.extensions.contentMetadata.presets;
     }
     this.displayAspect$ = this.store.select(infoDrawerMetadataAspect);
   }