diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
index bae774395..b0d912c18 100644
--- a/packages/cli/package-lock.json
+++ b/packages/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@noovolari/leapp-cli",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@noovolari/leapp-cli",
-      "version": "0.1.21",
+      "version": "0.1.22",
       "dependencies": {
         "@azure/msal-node": "^1.9.0",
         "@babel/plugin-proposal-decorators": "^7.16.5",
@@ -89,7 +89,7 @@
       }
     },
     "../core": {
-      "version": "0.1.122",
+      "version": "0.1.123",
       "dependencies": {
         "folder-hash": "^4.0.2",
         "require-module": "^0.1.0",
@@ -2041,6 +2041,21 @@
         "node": ">=v12"
       }
     },
+    "node_modules/@commitlint/is-ignored/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@commitlint/lint": {
       "version": "16.2.4",
       "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-16.2.4.tgz",
@@ -4924,9 +4939,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001415",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz",
-      "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==",
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
       "funding": [
         {
           "type": "opencollective",
@@ -6400,9 +6415,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.271",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz",
-      "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA=="
+      "version": "1.4.274",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.274.tgz",
+      "integrity": "sha512-Fgn7JZQzq85I81FpKUNxVLAzoghy8JZJ4NIue+YfUYBbu1AkpgzFvNwzF/ZNZH9ElkmJD0TSWu1F2gTpw/zZlg=="
     },
     "node_modules/emittery": {
       "version": "0.8.1",
@@ -8244,6 +8259,21 @@
         "url": "https://opencollective.com/node-fetch"
       }
     },
+    "node_modules/gushio/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gushio/node_modules/yaml": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
@@ -9203,9 +9233,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
@@ -11608,9 +11638,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.25.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz",
-      "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -12294,9 +12324,9 @@
       }
     },
     "node_modules/oclif/node_modules/aws-sdk": {
-      "version": "2.1228.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1228.0.tgz",
-      "integrity": "sha512-fc/eQEUiw+rOYl7SoIJBnmigFaET3t1zZiSUlMfnLfmpv2KGuhOoMaBTGQn9KkaFI1sSbeeoUjof7bxItgFDRA==",
+      "version": "2.1230.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1230.0.tgz",
+      "integrity": "sha512-7Y260dvzr7b8/lZhg6A7h5WyHvfCgdFL0NiBgCuT3/xlw9rvq9b08JNYErEpaJSmo+A5hW35n6wtzii4/FUSTA==",
       "dependencies": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -12481,9 +12511,9 @@
       }
     },
     "node_modules/ora/node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+      "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
       "dev": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -14242,9 +14272,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -15574,9 +15604,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz",
-      "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
+      "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -15711,9 +15741,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -17973,6 +18003,17 @@
       "requires": {
         "@commitlint/types": "^16.2.1",
         "semver": "7.3.7"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "@commitlint/lint": {
@@ -20296,9 +20337,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001415",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz",
-      "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ=="
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA=="
     },
     "cardinal": {
       "version": "2.1.1",
@@ -21410,9 +21451,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.271",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz",
-      "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA=="
+      "version": "1.4.274",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.274.tgz",
+      "integrity": "sha512-Fgn7JZQzq85I81FpKUNxVLAzoghy8JZJ4NIue+YfUYBbu1AkpgzFvNwzF/ZNZH9ElkmJD0TSWu1F2gTpw/zZlg=="
     },
     "emittery": {
       "version": "0.8.1",
@@ -22794,6 +22835,15 @@
             "formdata-polyfill": "^4.0.10"
           }
         },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
         "yaml": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
@@ -23453,9 +23503,9 @@
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.12.3",
@@ -25300,9 +25350,9 @@
       }
     },
     "node-abi": {
-      "version": "3.25.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz",
-      "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "requires": {
         "semver": "^7.3.5"
       }
@@ -25834,9 +25884,9 @@
           }
         },
         "aws-sdk": {
-          "version": "2.1228.0",
-          "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1228.0.tgz",
-          "integrity": "sha512-fc/eQEUiw+rOYl7SoIJBnmigFaET3t1zZiSUlMfnLfmpv2KGuhOoMaBTGQn9KkaFI1sSbeeoUjof7bxItgFDRA==",
+          "version": "2.1230.0",
+          "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1230.0.tgz",
+          "integrity": "sha512-7Y260dvzr7b8/lZhg6A7h5WyHvfCgdFL0NiBgCuT3/xlw9rvq9b08JNYErEpaJSmo+A5hW35n6wtzii4/FUSTA==",
           "requires": {
             "buffer": "4.9.2",
             "events": "1.1.1",
@@ -25978,9 +26028,9 @@
           "dev": true
         },
         "chalk": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-          "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+          "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
           "dev": true
         },
         "cli-cursor": {
@@ -27279,9 +27329,9 @@
       "integrity": "sha512-g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ=="
     },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -28277,9 +28327,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz",
-      "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
+      "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
       "optional": true
     },
     "unbox-primitive": {
@@ -28375,9 +28425,9 @@
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
     },
     "update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f0de8c410..6b337334d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@azure/msal-node": "^1.9.0",
     "@babel/plugin-proposal-decorators": "^7.16.5",
-    "@noovolari/leapp-core": "0.1.123",
+    "@noovolari/leapp-core": "file:../core",
     "@oclif/core": "1.6.0",
     "@oclif/plugin-help": "^5.1.12",
     "@types/inquirer": "8.2.0",
@@ -145,4 +145,4 @@
     "nightly": "gushio gushio/target-nightly.js"
   },
   "types": "dist/index.d.ts"
-}
+}
\ No newline at end of file
diff --git a/packages/cli/scopes/help.md b/packages/cli/scopes/help.md
index 44552d2c2..215bc5316 100644
--- a/packages/cli/scopes/help.md
+++ b/packages/cli/scopes/help.md
@@ -5,11 +5,11 @@ Display help for leapp.
 
 * [`leapp help [COMMAND]`](#leapp-help-command)
 
-# `leapp help [COMMAND]`
+## `leapp help [COMMAND]`
 
 Display help for leapp.
 
-```console
+```
 USAGE
   $ leapp help [COMMAND] [-n]
 
diff --git a/packages/cli/scopes/idp-url.md b/packages/cli/scopes/idp-url.md
index f34573c06..2601a617c 100644
--- a/packages/cli/scopes/idp-url.md
+++ b/packages/cli/scopes/idp-url.md
@@ -8,11 +8,11 @@ SAML 2.0 Identity providers URL management
 * [`leapp idp-url edit`](#leapp-idp-url-edit)
 * [`leapp idp-url list`](#leapp-idp-url-list)
 
-# `leapp idp-url create`
+## `leapp idp-url create`
 
 Create a new identity provider URL
 
-```console
+```
 USAGE
   $ leapp idp-url create [--idpUrl <value>]
 
@@ -28,11 +28,11 @@ EXAMPLES
   $leapp idp-url create --idpUrl ADDRESS
 ```
 
-# `leapp idp-url delete`
+## `leapp idp-url delete`
 
 Delete an identity provider URL
 
-```console
+```
 USAGE
   $ leapp idp-url delete [--idpUrlId <value>] [-f]
 
@@ -51,11 +51,11 @@ EXAMPLES
   $leapp idp-url delete --idpUrlId ID [--force, -f]
 ```
 
-# `leapp idp-url edit`
+## `leapp idp-url edit`
 
 Edit an identity provider URL
 
-```console
+```
 USAGE
   $ leapp idp-url edit [--idpUrlId <value>] [--idpUrl <value>]
 
@@ -72,11 +72,11 @@ EXAMPLES
   $leapp idp-url edit --idpUrlId ID --idpUrl ADDRESS
 ```
 
-# `leapp idp-url list`
+## `leapp idp-url list`
 
 Show identity providers list
 
-```console
+```
 USAGE
   $ leapp idp-url list [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
     [--csv | --no-truncate]] [--no-header | ]
diff --git a/packages/cli/scopes/integration.md b/packages/cli/scopes/integration.md
index 31b1a31b5..749db4f66 100644
--- a/packages/cli/scopes/integration.md
+++ b/packages/cli/scopes/integration.md
@@ -10,11 +10,11 @@ Leapp Integrations management
 * [`leapp integration logout`](#leapp-integration-logout)
 * [`leapp integration sync`](#leapp-integration-sync)
 
-# `leapp integration create`
+## `leapp integration create`
 
 Create a new integration
 
-```console
+```
 USAGE
   $ leapp integration create [--integrationAlias <value>] [--integrationPortalUrl <value>] [--integrationRegion <value>]
     [--integrationType AWS-SSO|AZURE] [--integrationTenantId <value>] [--integrationLocation <value>]
@@ -39,11 +39,11 @@ EXAMPLES
   $leapp integration create --integrationType AZURE --integrationAlias ALIAS --integrationTenantId TENANT --integrationLocation LOCATION
 ```
 
-# `leapp integration delete`
+## `leapp integration delete`
 
 Delete an integration
 
-```console
+```
 USAGE
   $ leapp integration delete [--integrationId <value>]
 
@@ -59,11 +59,11 @@ EXAMPLES
   $leapp integration delete --integrationId ID
 ```
 
-# `leapp integration list`
+## `leapp integration list`
 
 Show integrations list
 
-```console
+```
 USAGE
   $ leapp integration list [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
     [--csv | --no-truncate]] [--no-header | ]
@@ -86,11 +86,11 @@ EXAMPLES
   $leapp integration list
 ```
 
-# `leapp integration login`
+## `leapp integration login`
 
 Login to synchronize integration sessions
 
-```console
+```
 USAGE
   $ leapp integration login [--integrationId <value>]
 
@@ -106,11 +106,11 @@ EXAMPLES
   $leapp integration login --integrationId ID
 ```
 
-# `leapp integration logout`
+## `leapp integration logout`
 
 Logout from an integration
 
-```console
+```
 USAGE
   $ leapp integration logout [--integrationId <value>]
 
@@ -126,11 +126,11 @@ EXAMPLES
   $leapp integration logout --integrationId ID
 ```
 
-# `leapp integration sync`
+## `leapp integration sync`
 
 Synchronize integration sessions
 
-```console
+```
 USAGE
   $ leapp integration sync [--integrationId <value>]
 
diff --git a/packages/cli/scopes/profile.md b/packages/cli/scopes/profile.md
index 2dad034f9..9c1401a76 100644
--- a/packages/cli/scopes/profile.md
+++ b/packages/cli/scopes/profile.md
@@ -8,11 +8,11 @@ Leapp AWS Multi-profile management
 * [`leapp profile edit`](#leapp-profile-edit)
 * [`leapp profile list`](#leapp-profile-list)
 
-# `leapp profile create`
+## `leapp profile create`
 
 Create a new AWS named profile
 
-```console
+```
 USAGE
   $ leapp profile create [--profileName <value>]
 
@@ -28,11 +28,11 @@ EXAMPLES
   $leapp profile create --profileName PROFILENAME
 ```
 
-# `leapp profile delete`
+## `leapp profile delete`
 
 Delete an AWS named profile
 
-```console
+```
 USAGE
   $ leapp profile delete [--profileId <value>] [-f]
 
@@ -51,11 +51,11 @@ EXAMPLES
   $leapp profile delete --profileId PROFILEID [--force, -f]
 ```
 
-# `leapp profile edit`
+## `leapp profile edit`
 
 Rename an AWS named profile
 
-```console
+```
 USAGE
   $ leapp profile edit [--profileId <value>] [--profileName <value>]
 
@@ -72,11 +72,11 @@ EXAMPLES
   $leapp profile edit --profileId ID --profileName PROFILENAME
 ```
 
-# `leapp profile list`
+## `leapp profile list`
 
 Show profile list
 
-```console
+```
 USAGE
   $ leapp profile list [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
     [--csv | --no-truncate]] [--no-header | ]
diff --git a/packages/cli/scopes/region.md b/packages/cli/scopes/region.md
index 8c2829696..08a7dc333 100644
--- a/packages/cli/scopes/region.md
+++ b/packages/cli/scopes/region.md
@@ -6,11 +6,11 @@ Leapp regions management
 * [`leapp region get-default`](#leapp-region-get-default)
 * [`leapp region set-default`](#leapp-region-set-default)
 
-# `leapp region get-default`
+## `leapp region get-default`
 
 Displays the default region
 
-```console
+```
 USAGE
   $ leapp region get-default
 
@@ -21,11 +21,11 @@ EXAMPLES
   $leapp region get-default
 ```
 
-# `leapp region set-default`
+## `leapp region set-default`
 
 Change the default region
 
-```console
+```
 USAGE
   $ leapp region set-default [--region <value>]
 
diff --git a/packages/cli/scopes/session.md b/packages/cli/scopes/session.md
index 52db50a23..0c3ef8bdd 100644
--- a/packages/cli/scopes/session.md
+++ b/packages/cli/scopes/session.md
@@ -17,11 +17,11 @@ Sessions management
 * [`leapp session start-ssm-session`](#leapp-session-start-ssm-session)
 * [`leapp session stop`](#leapp-session-stop)
 
-# `leapp session add`
+## `leapp session add`
 
 Add a new session
 
-```console
+```
 USAGE
   $ leapp session add [--providerType aws] [--accessKey <value>] [--idpArn <value>] [--idpUrl <value>]
     [--mfaDevice <value>] [--sessionName <value>] [--parentSessionId <value>] [--profileId <value>] [--region <value>]
@@ -62,11 +62,11 @@ EXAMPLES
   $leapp session add --providerType aws --sessionType awsIamUser --sessionName NAME --region AWSREGION --profileId PROFILEID --accessKey ACCESSKEY --secretKey SECRETKEY (--mfaDevice MFADEVICEARN)
 ```
 
-# `leapp session change-profile`
+## `leapp session change-profile`
 
 Change a session named-profile
 
-```console
+```
 USAGE
   $ leapp session change-profile [--sessionId <value>] [--profileId <value>]
 
@@ -83,11 +83,11 @@ EXAMPLES
   $leapp session change-profile --profileId PROFILEID --sessionId SESSIONID
 ```
 
-# `leapp session change-region`
+## `leapp session change-region`
 
 Change a session region
 
-```console
+```
 USAGE
   $ leapp session change-region [--sessionId <value>] [--region <value>]
 
@@ -104,11 +104,11 @@ EXAMPLES
   $leapp session change-region --sessionId SESSIONID --region REGION
 ```
 
-# `leapp session current`
+## `leapp session current`
 
 Provides info about the current active session for a selected profile (if no profile is provided, it uses the profile default)
 
-```console
+```
 USAGE
   $ leapp session current [-i] [-p <value>] [-r aws|azure] [-f <value>]
 
@@ -129,11 +129,11 @@ EXAMPLES
   $leapp session current --format "alias accountNumber" --inline --provider aws
 ```
 
-# `leapp session delete`
+## `leapp session delete`
 
 Delete a session
 
-```console
+```
 USAGE
   $ leapp session delete [--sessionId <value>] [-f]
 
@@ -152,11 +152,11 @@ EXAMPLES
   $leapp session delete --sessionId SESSIONID [--force, -f]
 ```
 
-# `leapp session generate SESSIONID`
+## `leapp session generate SESSIONID`
 
 Generate STS temporary credentials for the given AWS session id
 
-```console
+```
 USAGE
   $ leapp session generate [SESSIONID]
 
@@ -170,11 +170,11 @@ EXAMPLES
   $leapp session generate 0a1b2c3d-4e5f-6a7b-8c9d-0e1f2a3b4c5d
 ```
 
-# `leapp session get-id`
+## `leapp session get-id`
 
 Get session id
 
-```console
+```
 USAGE
   $ leapp session get-id
 
@@ -185,11 +185,11 @@ EXAMPLES
   $leapp session get-id
 ```
 
-# `leapp session list`
+## `leapp session list`
 
 Show sessions list
 
-```console
+```
 USAGE
   $ leapp session list [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
     [--csv | --no-truncate]] [--no-header | ]
@@ -212,11 +212,11 @@ EXAMPLES
   $leapp session list
 ```
 
-# `leapp session open-web-console`
+## `leapp session open-web-console`
 
 Open an AWS Web Console
 
-```console
+```
 USAGE
   $ leapp session open-web-console [--sessionId <value>] [-p]
 
@@ -233,11 +233,11 @@ EXAMPLES
   $leapp session open-web-console --sessionId SESSIONID [--print, -p]
 ```
 
-# `leapp session run-aws-credential-plugin`
+## `leapp session run-aws-credential-plugin`
 
 Run a Leapp Plugin
 
-```console
+```
 USAGE
   $ leapp session run-aws-credential-plugin [--sessionId <value>] [--pluginName <value>]
 
@@ -254,11 +254,11 @@ EXAMPLES
   $leapp session run-plugin --sessionName SESSIONAME --pluginName PLUGINNAME
 ```
 
-# `leapp session start`
+## `leapp session start`
 
 Start a session
 
-```console
+```
 USAGE
   $ leapp session start [--sessionId <value>]
 
@@ -274,11 +274,11 @@ EXAMPLES
   $leapp session start --sessionId SESSIONID
 ```
 
-# `leapp session start-ssm-session`
+## `leapp session start-ssm-session`
 
 Start an AWS SSM session
 
-```console
+```
 USAGE
   $ leapp session start-ssm-session [--sessionId <value>] [--region <value>] [--ssmInstanceId <value>]
 
@@ -296,11 +296,11 @@ EXAMPLES
   $leapp session start-ssm-session --sessionId SESSIONID --region AWSREGION --ssmInstanceId EC2INSTANCEID
 ```
 
-# `leapp session stop`
+## `leapp session stop`
 
 Stop a session
 
-```console
+```
 USAGE
   $ leapp session stop [--sessionId <value>]
 
diff --git a/packages/cli/scopes/version.md b/packages/cli/scopes/version.md
index 4a8e5eb2b..93d691c9e 100644
--- a/packages/cli/scopes/version.md
+++ b/packages/cli/scopes/version.md
@@ -5,11 +5,11 @@ Displays the Cli and Core versions
 
 * [`leapp version`](#leapp-version)
 
-# `leapp version`
+## `leapp version`
 
 Displays the Cli and Core versions
 
-```console
+```
 USAGE
   $ leapp version
 
diff --git a/packages/cli/src/commands/session/start.ts b/packages/cli/src/commands/session/start.ts
index b523cf4fc..32ea9351e 100644
--- a/packages/cli/src/commands/session/start.ts
+++ b/packages/cli/src/commands/session/start.ts
@@ -3,6 +3,11 @@ import { Config } from "@oclif/core/lib/config/config";
 import { Session } from "@noovolari/leapp-core/models/session";
 import { SessionStatus } from "@noovolari/leapp-core/models/session-status";
 import { sessionId } from "../../flags";
+import { SessionType } from "@noovolari/leapp-core/models/session-type";
+import { AwsIamRoleFederatedSession } from "@noovolari/leapp-core/models/aws/aws-iam-role-federated-session";
+import { AwsIamRoleChainedSession } from "@noovolari/leapp-core/models/aws/aws-iam-role-chained-session";
+import { AwsSsoRoleSession } from "@noovolari/leapp-core/models/aws/aws-sso-role-session";
+import { AzureSession } from "@noovolari/leapp-core/models/azure/azure-session";
 
 export default class StartSession extends LeappCommand {
   static description = "Start a session";
@@ -64,9 +69,30 @@ export default class StartSession extends LeappCommand {
         name: "selectedSession",
         message: "select a session",
         type: "list",
-        choices: availableSessions.map((session: any) => ({ name: session.sessionName, value: session })),
+        choices: availableSessions.map((session: Session) => ({
+          name: `${session.sessionName} ${this.secondarySessionInfo(session) ? "- " + this.secondarySessionInfo(session) : ""}`,
+          value: session,
+        })),
       },
     ]);
     return answer.selectedSession;
   }
+
+  secondarySessionInfo(session: Session): string {
+    switch (session.type) {
+      case SessionType.awsIamRoleFederated:
+        return (session as AwsIamRoleFederatedSession).roleArn.split("role/")[1] || "";
+      case SessionType.awsIamRoleChained:
+        return (session as AwsIamRoleChainedSession).roleArn.split("role/")[1] || "";
+      case SessionType.awsIamUser:
+        return "";
+      case SessionType.awsSsoRole:
+        const splittedRoleArn = (session as AwsSsoRoleSession).roleArn.split("/");
+        splittedRoleArn.splice(0, 1);
+        return splittedRoleArn.join("/");
+      case SessionType.azure:
+        return (session as AzureSession).subscriptionId;
+    }
+    return "ciao";
+  }
 }
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index 1a9c091e8..63f9e1d7d 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@noovolari/leapp-core",
-  "version": "0.1.122",
+  "version": "0.1.123",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@noovolari/leapp-core",
-      "version": "0.1.122",
+      "version": "0.1.123",
       "dependencies": {
         "folder-hash": "^4.0.2",
         "require-module": "^0.1.0",
@@ -1977,6 +1977,21 @@
         "node": ">=v12"
       }
     },
+    "node_modules/@commitlint/is-ignored/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@commitlint/lint": {
       "version": "16.2.4",
       "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-16.2.4.tgz",
@@ -4521,9 +4536,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001415",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz",
-      "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==",
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
       "funding": [
         {
           "type": "opencollective",
@@ -4757,9 +4772,9 @@
       }
     },
     "node_modules/constructs": {
-      "version": "10.1.121",
-      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.121.tgz",
-      "integrity": "sha512-D3aE7RvLa5o66B3rFG25vmRoqLL/UUGG/OH6mjQFrlN+wjKusPVbRak2QJPyehPPPn4uFraZgtV3rzD+tULE5g==",
+      "version": "10.1.123",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.123.tgz",
+      "integrity": "sha512-uQtS81HjFznStVKXD8SmUUyT18drc4UWft3hBVqaFSX350auilXJ7IdVeZ7e2mFF7bGwr/60EmuY8o86l7y+rg==",
       "dev": true,
       "peer": true,
       "engines": {
@@ -5666,9 +5681,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.271",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz",
-      "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA=="
+      "version": "1.4.274",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.274.tgz",
+      "integrity": "sha512-Fgn7JZQzq85I81FpKUNxVLAzoghy8JZJ4NIue+YfUYBbu1AkpgzFvNwzF/ZNZH9ElkmJD0TSWu1F2gTpw/zZlg=="
     },
     "node_modules/emittery": {
       "version": "0.8.1",
@@ -6678,6 +6693,21 @@
         "node": ">=12"
       }
     },
+    "node_modules/gushio/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gushio/node_modules/yaml": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
@@ -7334,9 +7364,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
@@ -10307,9 +10337,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.25.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz",
-      "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "peer": true,
       "dependencies": {
         "semver": "^7.3.5"
@@ -10575,9 +10605,9 @@
       }
     },
     "node_modules/ora/node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+      "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
       "dev": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -11635,9 +11665,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -12864,9 +12894,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz",
-      "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
+      "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -12938,9 +12968,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -14850,6 +14880,17 @@
       "requires": {
         "@commitlint/types": "^16.2.1",
         "semver": "7.3.7"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "@commitlint/lint": {
@@ -16806,9 +16847,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001415",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz",
-      "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ=="
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA=="
     },
     "chalk": {
       "version": "2.4.2",
@@ -16983,9 +17024,9 @@
       }
     },
     "constructs": {
-      "version": "10.1.121",
-      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.121.tgz",
-      "integrity": "sha512-D3aE7RvLa5o66B3rFG25vmRoqLL/UUGG/OH6mjQFrlN+wjKusPVbRak2QJPyehPPPn4uFraZgtV3rzD+tULE5g==",
+      "version": "10.1.123",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.1.123.tgz",
+      "integrity": "sha512-uQtS81HjFznStVKXD8SmUUyT18drc4UWft3hBVqaFSX350auilXJ7IdVeZ7e2mFF7bGwr/60EmuY8o86l7y+rg==",
       "dev": true,
       "peer": true
     },
@@ -17679,9 +17720,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.271",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz",
-      "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA=="
+      "version": "1.4.274",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.274.tgz",
+      "integrity": "sha512-Fgn7JZQzq85I81FpKUNxVLAzoghy8JZJ4NIue+YfUYBbu1AkpgzFvNwzF/ZNZH9ElkmJD0TSWu1F2gTpw/zZlg=="
     },
     "emittery": {
       "version": "0.8.1",
@@ -18436,6 +18477,15 @@
             "universalify": "^2.0.0"
           }
         },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
         "yaml": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
@@ -18875,9 +18925,9 @@
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.12.3",
@@ -21130,9 +21180,9 @@
       }
     },
     "node-abi": {
-      "version": "3.25.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz",
-      "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "peer": true,
       "requires": {
         "semver": "^7.3.5"
@@ -21321,9 +21371,9 @@
           "dev": true
         },
         "chalk": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-          "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+          "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
           "dev": true
         },
         "cli-cursor": {
@@ -22128,9 +22178,9 @@
       }
     },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -23061,9 +23111,9 @@
       "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="
     },
     "uglify-js": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz",
-      "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
+      "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
       "optional": true
     },
     "unbox-primitive": {
@@ -23111,9 +23161,9 @@
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
diff --git a/packages/desktop-app/package-lock.json b/packages/desktop-app/package-lock.json
index e103baab7..2fdaf7a99 100644
--- a/packages/desktop-app/package-lock.json
+++ b/packages/desktop-app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "Leapp",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "Leapp",
-      "version": "0.14.3",
+      "version": "0.15.0",
       "hasInstallScript": true,
       "dependencies": {
         "@angular/animations": "^13.2.2",
@@ -25,7 +25,7 @@
         "@ngx-translate/core": "~13.0.0",
         "@ngx-translate/http-loader": "~6.0.0",
         "@noovolari/dpapi-addon": "0.1.2",
-        "@noovolari/leapp-core": "../core/dist",
+        "@noovolari/leapp-core": "file:../core",
         "@types/aws-sdk": "^2.7.0",
         "assert": "2.0.0",
         "aws-sdk": "2.928.0",
@@ -134,7 +134,72 @@
         "util": "^0.12.4"
       }
     },
-    "../core/dist": {},
+    "../core": {
+      "version": "0.1.123",
+      "dependencies": {
+        "folder-hash": "^4.0.2",
+        "require-module": "^0.1.0",
+        "tsoa": "^4.1.0"
+      },
+      "devDependencies": {
+        "@babel/preset-env": "^7.16.5",
+        "@babel/preset-typescript": "^7.16.5",
+        "@commitlint/cli": "16.2.1",
+        "@commitlint/config-conventional": "16.2.1",
+        "@types/aws-sdk": "^2.7.0",
+        "@types/jest": "^27.4.1",
+        "aws-cdk": "2.31.0",
+        "aws-cdk-lib": "2.31.0",
+        "gushio": "~0.7.0",
+        "jest": "^27.4.5",
+        "typescript": "4.5.5"
+      },
+      "peerDependencies": {
+        "@azure/msal-node": "^1.9.0",
+        "@babel/plugin-proposal-decorators": "^7.16.5",
+        "@types/aws-sdk": "^2.7.0",
+        "@types/node": "^16.9.4",
+        "@types/node-ipc": "9.2.0",
+        "@types/uuid": "^8.3.0",
+        "assert": "2.0.0",
+        "aws-sdk": "2.928.0",
+        "aws-sdk-mock": "5.3.0",
+        "chdir": "0.0.0",
+        "class-transformer": "^0.4.0",
+        "compare-versions": "^3.6.0",
+        "copy-dir": "~1.3.0",
+        "crypto-js": "~4.0.0",
+        "date-fns": "^2.26.0",
+        "es6-shim": "^0.35.6",
+        "extract-zip": "~2.0.1",
+        "fix-path": "~3.0.0",
+        "follow-redirects": "^1.14.9",
+        "fs-extra": "~9.1.0",
+        "fs-web": "1.0.1",
+        "http-proxy-agent": "4.0.1",
+        "https-proxy-agent": "5.0.0",
+        "ini": "~2.0.0",
+        "is-url": "^1.2.4",
+        "jwt-decode": "~3.1.2",
+        "keytar": "7.9.0",
+        "ms": "^2.1.3",
+        "node-ipc": "9.2.1",
+        "node-log-rotate": "~0.1.5",
+        "node-machine-id": "~1.1.12",
+        "reflect-metadata": "^0.1.13",
+        "rimraf": "~3.0.2",
+        "rxjs": "~6.6.7",
+        "saml-encoder-decoder-js": "~1.0.1",
+        "semver": "~7.3.5",
+        "standard-version": "^9.3.0",
+        "sudo-prompt": "~9.2.1",
+        "tar": "^6.1.11",
+        "tslib": "^2.3.1",
+        "uuid": "~8.3.2",
+        "wait-on": "^6.0.0",
+        "zlib": "~1.0.5"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -670,9 +735,9 @@
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/magic-string": {
-      "version": "0.26.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.5.tgz",
-      "integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==",
+      "version": "0.26.6",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.6.tgz",
+      "integrity": "sha512-6d+3bFybzyQFJYSoRsl9ZC0wheze8M1LrQC7tNMRqXR4izUTDOLMd9BtSuExK9iAukFh+s5K0WAhc/dlQ+HKYA==",
       "dev": true,
       "dependencies": {
         "sourcemap-codec": "^1.4.8"
@@ -2876,6 +2941,21 @@
         "node": ">=v12"
       }
     },
+    "node_modules/@commitlint/is-ignored/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@commitlint/lint": {
       "version": "16.2.4",
       "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-16.2.4.tgz",
@@ -3826,7 +3906,7 @@
       }
     },
     "node_modules/@noovolari/leapp-core": {
-      "resolved": "../core/dist",
+      "resolved": "../core",
       "link": true
     },
     "node_modules/@npmcli/fs": {
@@ -3912,21 +3992,21 @@
       }
     },
     "node_modules/@nrwl/cli": {
-      "version": "14.8.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.2.tgz",
-      "integrity": "sha512-I+oblryFkZJYk9TMsBWNdN0SV7OjsiD80gD1WjA1KXEQiFVfopYgwErBrxoenodncXrMFRCk/QR9U5F+23+Vow==",
+      "version": "14.8.3",
+      "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.3.tgz",
+      "integrity": "sha512-a8URAbqyZvegXMYU8pCA3Hfv0UdiDJc6HboazxinCJJgZWyqKYxRIWmKiWnfpXsr+qF6ntmBR/tC6yHbOL22gQ==",
       "dev": true,
       "dependencies": {
-        "nx": "14.8.2"
+        "nx": "14.8.3"
       }
     },
     "node_modules/@nrwl/cli/node_modules/@nrwl/tao": {
-      "version": "14.8.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.2.tgz",
-      "integrity": "sha512-a4+O307YZJf1H6CDQFGs4DoUvl7xUFSJo2rNHoR9jDlWU+Ug3n0iivX7Fih6Ui0gX4ocEpRwzNMmJhEmEq1BYw==",
+      "version": "14.8.3",
+      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.3.tgz",
+      "integrity": "sha512-lN7+1biSM/7PYMMgh3jjOXJ9fe6VjhVrtZsDcB6lcklpShjXfHXqlpXDM7vjlw19aLeZMdFWHFoU2C5BTBtzgQ==",
       "dev": true,
       "dependencies": {
-        "nx": "14.8.2"
+        "nx": "14.8.3"
       },
       "bin": {
         "tao": "index.js"
@@ -3953,6 +4033,15 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
+    "node_modules/@nrwl/cli/node_modules/axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "dev": true,
+      "dependencies": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
     "node_modules/@nrwl/cli/node_modules/chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -4085,18 +4174,19 @@
       "dev": true
     },
     "node_modules/@nrwl/cli/node_modules/nx": {
-      "version": "14.8.2",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-14.8.2.tgz",
-      "integrity": "sha512-pPijBoeybsIlCD8FMH8WTns+pcIL+0ZOh/+otUX2LfVsi+ppH33GUxO9QVLPrLcyGaoHhwil4hYBxPIQ7Z1r2g==",
+      "version": "14.8.3",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-14.8.3.tgz",
+      "integrity": "sha512-6aMYrzlTqE77vHbaE1teI5P1A2oYkJGkuDMIo/zegRwUxCAjRzLAluUgPrmgqhuPTyTDn8p4aDfxAWV3Q0o/2Q==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@nrwl/cli": "14.8.2",
-        "@nrwl/tao": "14.8.2",
+        "@nrwl/cli": "14.8.3",
+        "@nrwl/tao": "14.8.3",
         "@parcel/watcher": "2.0.4",
         "@yarnpkg/lockfile": "^1.1.0",
         "@yarnpkg/parsers": "^3.0.0-rc.18",
         "@zkochan/js-yaml": "0.0.6",
+        "axios": "0.21.1",
         "chalk": "4.1.0",
         "chokidar": "^3.5.1",
         "cli-cursor": "3.1.0",
@@ -6996,9 +7086,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001415",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz",
-      "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==",
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
       "dev": true,
       "funding": [
         {
@@ -10238,9 +10328,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.271",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz",
-      "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA==",
+      "version": "1.4.274",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.274.tgz",
+      "integrity": "sha512-Fgn7JZQzq85I81FpKUNxVLAzoghy8JZJ4NIue+YfUYBbu1AkpgzFvNwzF/ZNZH9ElkmJD0TSWu1F2gTpw/zZlg==",
       "dev": true
     },
     "node_modules/electron-updater": {
@@ -13074,9 +13164,9 @@
       }
     },
     "node_modules/gushio/node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+      "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
       "dev": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -13253,6 +13343,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gushio/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gushio/node_modules/strip-ansi": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
@@ -14628,9 +14733,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
@@ -19508,9 +19613,9 @@
       }
     },
     "node_modules/prebuild-install/node_modules/node-abi": {
-      "version": "3.25.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz",
-      "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+      "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -21193,9 +21298,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -23145,9 +23250,9 @@
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/uglify-js": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz",
-      "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
+      "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -23258,9 +23363,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "dev": true,
       "funding": [
         {
@@ -24806,9 +24911,9 @@
           }
         },
         "magic-string": {
-          "version": "0.26.5",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.5.tgz",
-          "integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==",
+          "version": "0.26.6",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.6.tgz",
+          "integrity": "sha512-6d+3bFybzyQFJYSoRsl9ZC0wheze8M1LrQC7tNMRqXR4izUTDOLMd9BtSuExK9iAukFh+s5K0WAhc/dlQ+HKYA==",
           "dev": true,
           "requires": {
             "sourcemap-codec": "^1.4.8"
@@ -26373,6 +26478,17 @@
       "requires": {
         "@commitlint/types": "^16.2.1",
         "semver": "7.3.7"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "@commitlint/lint": {
@@ -27089,7 +27205,23 @@
       }
     },
     "@noovolari/leapp-core": {
-      "version": "file:../core/dist"
+      "version": "file:../core",
+      "requires": {
+        "@babel/preset-env": "^7.16.5",
+        "@babel/preset-typescript": "^7.16.5",
+        "@commitlint/cli": "16.2.1",
+        "@commitlint/config-conventional": "16.2.1",
+        "@types/aws-sdk": "^2.7.0",
+        "@types/jest": "^27.4.1",
+        "aws-cdk": "2.31.0",
+        "aws-cdk-lib": "2.31.0",
+        "folder-hash": "^4.0.2",
+        "gushio": "~0.7.0",
+        "jest": "^27.4.5",
+        "require-module": "^0.1.0",
+        "tsoa": "^4.1.0",
+        "typescript": "4.5.5"
+      }
     },
     "@npmcli/fs": {
       "version": "1.1.1",
@@ -27165,21 +27297,21 @@
       }
     },
     "@nrwl/cli": {
-      "version": "14.8.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.2.tgz",
-      "integrity": "sha512-I+oblryFkZJYk9TMsBWNdN0SV7OjsiD80gD1WjA1KXEQiFVfopYgwErBrxoenodncXrMFRCk/QR9U5F+23+Vow==",
+      "version": "14.8.3",
+      "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.3.tgz",
+      "integrity": "sha512-a8URAbqyZvegXMYU8pCA3Hfv0UdiDJc6HboazxinCJJgZWyqKYxRIWmKiWnfpXsr+qF6ntmBR/tC6yHbOL22gQ==",
       "dev": true,
       "requires": {
-        "nx": "14.8.2"
+        "nx": "14.8.3"
       },
       "dependencies": {
         "@nrwl/tao": {
-          "version": "14.8.2",
-          "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.2.tgz",
-          "integrity": "sha512-a4+O307YZJf1H6CDQFGs4DoUvl7xUFSJo2rNHoR9jDlWU+Ug3n0iivX7Fih6Ui0gX4ocEpRwzNMmJhEmEq1BYw==",
+          "version": "14.8.3",
+          "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.3.tgz",
+          "integrity": "sha512-lN7+1biSM/7PYMMgh3jjOXJ9fe6VjhVrtZsDcB6lcklpShjXfHXqlpXDM7vjlw19aLeZMdFWHFoU2C5BTBtzgQ==",
           "dev": true,
           "requires": {
-            "nx": "14.8.2"
+            "nx": "14.8.3"
           }
         },
         "ansi-styles": {
@@ -27197,6 +27329,15 @@
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
+        "axios": {
+          "version": "0.21.1",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+          "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+          "dev": true,
+          "requires": {
+            "follow-redirects": "^1.10.0"
+          }
+        },
         "chalk": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -27299,17 +27440,18 @@
           "dev": true
         },
         "nx": {
-          "version": "14.8.2",
-          "resolved": "https://registry.npmjs.org/nx/-/nx-14.8.2.tgz",
-          "integrity": "sha512-pPijBoeybsIlCD8FMH8WTns+pcIL+0ZOh/+otUX2LfVsi+ppH33GUxO9QVLPrLcyGaoHhwil4hYBxPIQ7Z1r2g==",
+          "version": "14.8.3",
+          "resolved": "https://registry.npmjs.org/nx/-/nx-14.8.3.tgz",
+          "integrity": "sha512-6aMYrzlTqE77vHbaE1teI5P1A2oYkJGkuDMIo/zegRwUxCAjRzLAluUgPrmgqhuPTyTDn8p4aDfxAWV3Q0o/2Q==",
           "dev": true,
           "requires": {
-            "@nrwl/cli": "14.8.2",
-            "@nrwl/tao": "14.8.2",
+            "@nrwl/cli": "14.8.3",
+            "@nrwl/tao": "14.8.3",
             "@parcel/watcher": "2.0.4",
             "@yarnpkg/lockfile": "^1.1.0",
             "@yarnpkg/parsers": "^3.0.0-rc.18",
             "@zkochan/js-yaml": "0.0.6",
+            "axios": "0.21.1",
             "chalk": "4.1.0",
             "chokidar": "^3.5.1",
             "cli-cursor": "3.1.0",
@@ -29648,9 +29790,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001415",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz",
-      "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==",
+      "version": "1.0.30001416",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001416.tgz",
+      "integrity": "sha512-06wzzdAkCPZO+Qm4e/eNghZBDfVNDsCgw33T27OwBH9unE9S478OYw//Q2L7Npf/zBzs7rjZOszIFQkwQKAEqA==",
       "dev": true
     },
     "caseless": {
@@ -32152,9 +32294,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.271",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz",
-      "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA==",
+      "version": "1.4.274",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.274.tgz",
+      "integrity": "sha512-Fgn7JZQzq85I81FpKUNxVLAzoghy8JZJ4NIue+YfUYBbu1AkpgzFvNwzF/ZNZH9ElkmJD0TSWu1F2gTpw/zZlg==",
       "dev": true
     },
     "electron-updater": {
@@ -34190,9 +34332,9 @@
           }
         },
         "chalk": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-          "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+          "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
           "dev": true
         },
         "cli-cursor": {
@@ -34298,6 +34440,15 @@
             "signal-exit": "^3.0.2"
           }
         },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
         "strip-ansi": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
@@ -35291,9 +35442,9 @@
       }
     },
     "istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.12.3",
@@ -38979,9 +39130,9 @@
           "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
         },
         "node-abi": {
-          "version": "3.25.0",
-          "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz",
-          "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==",
+          "version": "3.26.0",
+          "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
+          "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
           "requires": {
             "semver": "^7.3.5"
           }
@@ -40285,9 +40436,9 @@
       }
     },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -41768,9 +41919,9 @@
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "uglify-js": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz",
-      "integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
+      "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
       "optional": true
     },
     "unbox-primitive": {
@@ -41851,9 +42002,9 @@
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "dev": true,
       "requires": {
         "escalade": "^3.1.1",
diff --git a/packages/desktop-app/package.json b/packages/desktop-app/package.json
index fd2aa7194..3bc482e36 100644
--- a/packages/desktop-app/package.json
+++ b/packages/desktop-app/package.json
@@ -156,7 +156,7 @@
     "@ngx-translate/core": "~13.0.0",
     "@ngx-translate/http-loader": "~6.0.0",
     "@noovolari/dpapi-addon": "0.1.2",
-    "@noovolari/leapp-core": "../core/dist",
+    "@noovolari/leapp-core": "file:../core",
     "@types/aws-sdk": "^2.7.0",
     "assert": "2.0.0",
     "aws-sdk": "2.928.0",
@@ -264,4 +264,4 @@
     "typescript": "4.5.5",
     "util": "^0.12.4"
   }
-}
+}
\ No newline at end of file