diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72849cf35c..2db7d0a781 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -671,26 +671,26 @@ jobs:
             declare -A tag0=(
                 [key]='platform'
                 [value]='macos'
-                [objectDownload]=${appFileName}'-mac-x64.dmg'
-                [objectUpgrade]=${appFileName}'.zip'
+                [objectDownload]=${applicationName}'-mac-x64.dmg'
+                [objectUpgrade]=${applicationName}'.zip'
             )
 
             declare -A tag1=(
                 [key]='platform'
                 [value]='windows'
-                [objectDownload]=${appFileName}'-win-installer.exe'
+                [objectDownload]=${applicationName}'-win-installer.exe'
             )
 
             declare -A tag2=(
                 [key]='platform'
                 [value]='linux_AppImage'
-                [objectDownload]=${appFileName}'-linux.AppImage'
+                [objectDownload]=${applicationName}'-linux.AppImage'
             )
 
             declare -A tag3=(
                 [key]='platform'
                 [value]='linux_deb'
-                [objectDownload]=${appFileName}'-linux.deb'
+                [objectDownload]=${applicationName}'-linux.deb'
             )
 
             # loop for add all tags to each app and create metrics
diff --git a/configs/webpack.config.main.prod.babel.js b/configs/webpack.config.main.prod.babel.js
index 5731a8cbba..0c679cfb97 100644
--- a/configs/webpack.config.main.prod.babel.js
+++ b/configs/webpack.config.main.prod.babel.js
@@ -64,6 +64,8 @@ export default merge(baseConfig, {
       SERVER_TLS: true,
       SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
+      APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
+      UPGRADES_LINK: process.env.UPGRADES_LINK || '',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
diff --git a/configs/webpack.config.main.stage.babel.js b/configs/webpack.config.main.stage.babel.js
index 76e6d43ab7..8253294c73 100644
--- a/configs/webpack.config.main.stage.babel.js
+++ b/configs/webpack.config.main.stage.babel.js
@@ -23,6 +23,8 @@ export default merge(mainProdConfig, {
       SERVER_TLS: true,
       SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
+      APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
+      UPGRADES_LINK: process.env.UPGRADES_LINK || '',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
diff --git a/electron-builder.json b/electron-builder.json
index 9c046951c8..6d1a875a27 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -12,7 +12,7 @@
     "package.json"
   ],
   "afterSign": "electron-builder-notarize",
-  "artifactName": "RedisInsight.${ext}",
+  "artifactName": "${productName}.${ext}",
   "compression": "normal",
   "mac": {
     "target": ["dmg", "zip"],
@@ -24,7 +24,7 @@
     "gatekeeperAssess": false
   },
   "dmg": {
-    "artifactName": "RedisInsight-${os}-x64.${ext}",
+    "artifactName": "${productName}-${os}-x64.${ext}",
     "contents": [
       {
         "x": 130,
@@ -40,14 +40,14 @@
   },
   "win": {
     "target": ["nsis"],
-    "artifactName": "RedisInsight-${os}-installer.${ext}"
+    "artifactName": "${productName}-${os}-installer.${ext}"
   },
   "linux": {
     "icon": "./resources/icons",
     "target": ["deb", "AppImage"],
     "synopsis": "Redis GUI by Redis Ltd.",
     "category": "Development",
-    "artifactName": "RedisInsight-${os}.${ext}",
+    "artifactName": "${productName}-${os}.${ext}",
     "desktop": {
       "Name": "RedisInsight",
       "Type": "Application",
diff --git a/redisinsight/main.dev.ts b/redisinsight/main.dev.ts
index 108625e1a5..a4564209a6 100644
--- a/redisinsight/main.dev.ts
+++ b/redisinsight/main.dev.ts
@@ -49,10 +49,8 @@ export default class AppUpdater {
     log.transports.file.level = 'info';
 
     autoUpdater.setFeedURL({
-      provider: 's3',
-      path: 'public/upgrades/',
-      bucket: process.env.MANUAL_UPDATE_BUCKET || process.env.AWS_BUCKET_NAME,
-      region: 'us-east-1',
+      provider: 'generic',
+      url: process.env.MANUAL_UPGRADES_LINK || process.env.UPGRADES_LINK,
     });
 
     autoUpdater.checkForUpdatesAndNotify();
diff --git a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
index 84ea280b03..9cb89bd37b 100644
--- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
+++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
@@ -28,13 +28,13 @@ test('Verify that user can resize(maximize)/(minimize) the enablement area (the
     const offsetX = 100;
     const areaWidthBefore = await workbenchPage.preselectsAreaContainer.clientWidth;
     //Minimize the area with default scripts
-    await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.2 });
+    await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.1 });
     await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).lt(areaWidthBefore, 'Default scripts area is smaller after resize');
     //Maximize the area with default scripts
     const areaWidthAfter = await workbenchPage.preselectsAreaContainer.clientWidth;
     await t.click(workbenchPage.preselectsAreaContainer);
-    await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 });
-    await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize');
+    await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.1 });
+    await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gte(areaWidthAfter, 'Default scripts area is bigger after resize');
 });
 test('Verify that user can expand/collapse the enablement area', async t => {
     //Collapse the area with default scripts