diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a895997b3..8effd805ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# release-9 (2023-01-12)
+
+### Bug Fixes
+
+- **deps:** update dependency @oclif/core to v1.24.0 j:cdx-227 ([#1082](https://github.com/coveo/cli/issues/1082)) ([41f4867](https://github.com/coveo/cli/commits/41f4867afc0ac2c49b6d87c0d698377f47575912))
+- **deps:** update oclif packages j:cdx-227 ([#1075](https://github.com/coveo/cli/issues/1075)) ([f36d1e8](https://github.com/coveo/cli/commits/f36d1e8213748252a12881c473f576ce8146f236))
+- update organization flag ([#1076](https://github.com/coveo/cli/issues/1076)) ([85552b8](https://github.com/coveo/cli/commits/85552b864a08227d90c36bac4e1cf111913d24b0)), closes [#773](https://github.com/coveo/cli/issues/773)
+
+### Features
+
+- migrate to Atomic V2 ([#1074](https://github.com/coveo/cli/issues/1074)) ([50c2f3a](https://github.com/coveo/cli/commits/50c2f3acdeaaf605dde3a8bb3a0c400b35de26d8))
+
 # release-8 (2022-12-14)
 
 ### Bug Fixes
diff --git a/package-lock.json b/package-lock.json
index 3bf3c5924f..96675544cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cli-tools",
-  "version": "1.0.0-8",
+  "version": "1.0.0-9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cli-tools",
-      "version": "1.0.0-8",
+      "version": "1.0.0-9",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -229,22 +229,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/animations": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.1.0.tgz",
-      "integrity": "sha512-uBw1iQVJ3QS5e/gypsD7M50O//9GvpphgGqt9ZClknyD8dxO/YryEB+Kt4GNvNQxRKhRTksD8r4KaodukdQ15w==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "15.1.0"
-      }
-    },
     "node_modules/@angular/cdk": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.1.0.tgz",
@@ -335,26 +319,11 @@
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/@angular/common": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.1.0.tgz",
-      "integrity": "sha512-O0JKOeJ7dFcd/mnnfm4xQOYTAc+yL+OrRpGte7z84lKPU2fupLpGW/30tHUy1TXixsANyTLC3cTVXTY5szPdqg==",
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "15.1.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
     "node_modules/@angular/core": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.1.0.tgz",
       "integrity": "sha512-HiwctuR73MuLoLeP35j9xF8/SIg7ELx+iHZtp/TBfoH+LOmjWbdrAdVAPTbqnxvK0aJG+527dhgC6tBOXgBTcg==",
+      "dev": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2722,6 +2691,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -2737,6 +2707,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -7863,7 +7834,7 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@vuetify/loader-shared/-/loader-shared-1.7.0.tgz",
       "integrity": "sha512-Db4K67wMhduDsbvdRBYkrYuomti+j0E/1vlz1lnDng5F9LYYBcXa60qypIazVGI6GX/CuY1vshN6XGtGQI4FKg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "find-cache-dir": "^3.3.2",
         "upath": "^2.0.1"
@@ -8963,7 +8934,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9498,7 +9469,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -10065,7 +10036,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/compare-func": {
       "version": "2.0.0",
@@ -11290,6 +11261,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -11520,7 +11492,7 @@
       "version": "0.15.18",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
       "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
-      "devOptional": true,
+      "dev": true,
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
@@ -11560,6 +11532,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -11575,6 +11548,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -11590,6 +11564,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -11605,6 +11580,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -11620,6 +11596,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -11635,6 +11612,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -11650,6 +11628,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11665,6 +11644,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11680,6 +11660,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11695,6 +11676,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11710,6 +11692,7 @@
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11725,6 +11708,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11740,6 +11724,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11755,6 +11740,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -11770,6 +11756,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "netbsd"
@@ -11785,6 +11772,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "openbsd"
@@ -11800,6 +11788,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "sunos"
@@ -11815,6 +11804,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -11830,6 +11820,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -11845,6 +11836,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -12913,7 +12905,7 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
       "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -14750,6 +14742,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14794,7 +14787,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz",
       "integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -15007,7 +15000,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -17211,7 +17204,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -21694,7 +21687,7 @@
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
       "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -22031,7 +22024,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -22481,23 +22474,6 @@
       "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz",
       "integrity": "sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="
     },
-    "node_modules/rollup": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.9.1.tgz",
-      "integrity": "sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w==",
-      "dev": true,
-      "peer": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/rollup-plugin-dotenv": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/rollup-plugin-dotenv/-/rollup-plugin-dotenv-0.4.1.tgz",
@@ -22656,7 +22632,7 @@
       "version": "1.57.1",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz",
       "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -24421,7 +24397,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
       "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=4",
         "yarn": "*"
@@ -24840,7 +24816,7 @@
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.5.tgz",
       "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "esbuild": "^0.15.9",
         "postcss": "^8.4.18",
@@ -24901,7 +24877,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vite-plugin-vuetify/-/vite-plugin-vuetify-1.0.1.tgz",
       "integrity": "sha512-/xHsIDuHxq7f6fDqCBYxNascLhDi+X8dV3RzTwmo4mGPrSnGq9pHv8wJsXBIQIT3nY8s16V0lmd6sXMjm0F8wg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "@vuetify/loader-shared": "^1.7.0",
         "debug": "^4.3.3",
@@ -24919,7 +24895,7 @@
       "version": "2.79.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
       "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
-      "devOptional": true,
+      "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -26683,15 +26659,6 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/zone.js": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.12.0.tgz",
-      "integrity": "sha512-XtC+I5dXU14HrzidAKBNMqneIVUykLEAA1x+v4KVrd6AUPWlwYORF8KgsVqvgdHiKZ4BkxxjvYi/ksEixTPR0Q==",
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      }
-    },
     "packages/cli-e2e": {
       "name": "@coveo/cli-e2e",
       "version": "1.25.0",
@@ -26743,6 +26710,165 @@
         "node": ">=18"
       }
     },
+    "packages/cli-e2e/node_modules/@coveo/cli": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@coveo/cli/-/cli-2.2.2.tgz",
+      "integrity": "sha512-gy79PmlpssPnLjmAoGzcN1OrJMrp0IILt/0gpC+pjAdeLQidbU6SrEgtSinmEAj0NsYUxdm6Mh2fiIj9klRTWA==",
+      "dependencies": {
+        "@amplitude/identify": "^1.9.0",
+        "@amplitude/node": "^1.9.0",
+        "@coveo/cli-commons": "2.2.2",
+        "@coveo/cli-plugin-source": "2.0.3",
+        "@coveo/platform-client": "37.13.0",
+        "@coveo/push-api-client": "^2.7.7",
+        "@oclif/core": "1.23.2",
+        "@oclif/plugin-help": "5.1.22",
+        "@oclif/plugin-plugins": "2.1.12",
+        "@oclif/plugin-update": "3.0.12",
+        "@oclif/plugin-version": "1.1.4",
+        "abortcontroller-polyfill": "^1.7.1",
+        "archiver": "^5.3.0",
+        "async-retry": "^1.3.1",
+        "axios": "^1.0.0",
+        "chalk": "4.1.2",
+        "cli-progress": "^3.9.1",
+        "extract-zip": "^2.0.1",
+        "fs-extra": "^10.0.0",
+        "get-port": "5.1.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-unicode-supported": "^1.3.0",
+        "isomorphic-fetch": "^3.0.0",
+        "json2csv": "^5.0.6",
+        "jsonschema": "1.4.1",
+        "node-machine-id": "^1.1.12",
+        "open": "^8.4.0",
+        "semver": "^7.3.4",
+        "tmp": "^0.2.1",
+        "ts-dedent": "2.2.0",
+        "tslib": "2.4.1",
+        "undici": "5.15.0"
+      },
+      "bin": {
+        "coveo": "bin/run"
+      },
+      "engines": {
+        "node": "16.x || 18.x"
+      },
+      "peerDependencies": {
+        "create-react-app": "*",
+        "netlify-cli": "^12.0.0"
+      },
+      "peerDependenciesMeta": {
+        "create-react-app": {
+          "optional": true
+        },
+        "netlify-cli": {
+          "optional": true
+        }
+      }
+    },
+    "packages/cli-e2e/node_modules/@coveo/cli-commons": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@coveo/cli-commons/-/cli-commons-2.2.2.tgz",
+      "integrity": "sha512-qwCd0Q/95bV6+df+tGmhVMcHw49pbUWWo+klSdXysFss96wLwLx06F7ykAFKEfvob5r9iEPGtS47EQzTMOuPbw==",
+      "dependencies": {
+        "@amplitude/node": "1.10.2",
+        "@coveo/platform-client": "37.13.0",
+        "@oclif/core": "1.23.2",
+        "abortcontroller-polyfill": "1.7.5",
+        "chalk": "4.1.2",
+        "fs-extra": "10.1.0",
+        "https-proxy-agent": "5.0.1",
+        "isomorphic-fetch": "3.0.0",
+        "semver": "7.3.8",
+        "ts-dedent": "2.2.0"
+      }
+    },
+    "packages/cli-e2e/node_modules/@coveo/cli-plugin-source": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@coveo/cli-plugin-source/-/cli-plugin-source-2.0.3.tgz",
+      "integrity": "sha512-8t8jy9JsGmSKV5MDQHDhk/hKCf9ndA9Na6xmw/nPc6OnImZZYmaLGJSP275RfASmFzghYl/kOm6cAI9J9qoF5Q==",
+      "dependencies": {
+        "@coveo/cli-commons": "2.2.2",
+        "@coveo/platform-client": "37.13.0",
+        "@coveo/push-api-client": "^2.7.7",
+        "@oclif/core": "1.23.2",
+        "@oclif/plugin-help": "5.1.22",
+        "@oclif/plugin-plugins": "2.1.12",
+        "chalk": "4.1.2",
+        "jsonschema": "1.4.1",
+        "ts-dedent": "2.2.0"
+      },
+      "engines": {
+        "node": "16.x || 18.x"
+      }
+    },
+    "packages/cli-e2e/node_modules/@oclif/core": {
+      "version": "1.23.2",
+      "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.23.2.tgz",
+      "integrity": "sha512-NdaOaUDTRc6g1yTkOAKiEVOiQhc5CNcWNXa0QF4IS4yTjNqp4DOzgtF9Dwe585nPEKzSbTBiz1wyLOa4qIHSRQ==",
+      "dependencies": {
+        "@oclif/linewrap": "^1.0.0",
+        "@oclif/screen": "^3.0.4",
+        "ansi-escapes": "^4.3.2",
+        "ansi-styles": "^4.3.0",
+        "cardinal": "^2.1.1",
+        "chalk": "^4.1.2",
+        "clean-stack": "^3.0.1",
+        "cli-progress": "^3.10.0",
+        "debug": "^4.3.4",
+        "ejs": "^3.1.6",
+        "fs-extra": "^9.1.0",
+        "get-package-type": "^0.1.0",
+        "globby": "^11.1.0",
+        "hyperlinker": "^1.0.0",
+        "indent-string": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "js-yaml": "^3.14.1",
+        "natural-orderby": "^2.0.3",
+        "object-treeify": "^1.1.33",
+        "password-prompt": "^1.1.2",
+        "semver": "^7.3.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "supports-color": "^8.1.1",
+        "supports-hyperlinks": "^2.2.0",
+        "tslib": "^2.4.1",
+        "widest-line": "^3.1.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "packages/cli-e2e/node_modules/@oclif/core/node_modules/clean-stack": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz",
+      "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==",
+      "dependencies": {
+        "escape-string-regexp": "4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/cli-e2e/node_modules/@oclif/core/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "packages/cli-e2e/node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -26879,7 +27005,7 @@
     },
     "packages/cli/commons": {
       "name": "@coveo/cli-commons",
-      "version": "2.2.2",
+      "version": "2.2.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@amplitude/node": "1.10.2",
@@ -26916,13 +27042,13 @@
     },
     "packages/cli/core": {
       "name": "@coveo/cli",
-      "version": "2.2.2",
+      "version": "2.2.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@amplitude/identify": "^1.9.0",
         "@amplitude/node": "^1.9.0",
-        "@coveo/cli-commons": "2.2.2",
-        "@coveo/cli-plugin-source": "2.0.3",
+        "@coveo/cli-commons": "2.2.3",
+        "@coveo/cli-plugin-source": "2.0.4",
         "@coveo/platform-client": "37.13.0",
         "@coveo/push-api-client": "^2.7.7",
         "@oclif/core": "1.24.0",
@@ -26958,10 +27084,10 @@
       "devDependencies": {
         "@amplitude/types": "1.10.2",
         "@babel/core": "7.20.12",
-        "@coveo/angular": "1.35.21",
+        "@coveo/angular": "1.35.22",
         "@coveo/cli-commons-dev": "6.0.2",
-        "@coveo/cra-template": "1.36.3",
-        "@coveo/create-atomic": "1.36.2",
+        "@coveo/cra-template": "1.36.4",
+        "@coveo/create-atomic": "1.36.3",
         "@coveo/create-headless-vue": "1.0.3",
         "@oclif/test": "2.2.20",
         "@types/archiver": "5.3.1",
@@ -27007,10 +27133,10 @@
     },
     "packages/cli/source": {
       "name": "@coveo/cli-plugin-source",
-      "version": "2.0.3",
+      "version": "2.0.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@coveo/cli-commons": "2.2.2",
+        "@coveo/cli-commons": "2.2.3",
         "@coveo/platform-client": "37.13.0",
         "@coveo/push-api-client": "^2.7.7",
         "@oclif/core": "1.24.0",
@@ -27042,14 +27168,14 @@
     },
     "packages/ui/angular": {
       "name": "@coveo/angular",
-      "version": "1.35.21",
+      "version": "1.35.22",
       "license": "Apache-2.0",
       "dependencies": {
         "@angular-devkit/core": "^15.0.0",
         "@angular-devkit/schematics": "^15.0.0",
         "@angular/cdk": "^15.0.0",
         "@angular/cli": "^15.0.0",
-        "@coveo/search-token-server": "1.35.18",
+        "@coveo/search-token-server": "1.35.19",
         "@schematics/angular": "^15.0.0",
         "jest-config": "29.3.1"
       },
@@ -27072,7 +27198,7 @@
     },
     "packages/ui/atomic/create-atomic": {
       "name": "@coveo/create-atomic",
-      "version": "1.36.2",
+      "version": "1.36.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@coveo/platform-client": "37.13.0",
@@ -27401,11 +27527,11 @@
     },
     "packages/ui/atomic/template": {
       "name": "@coveo/create-atomic-template",
-      "version": "1.36.1",
+      "version": "1.37.0",
       "dependencies": {
         "@coveo/atomic": "2.4.2",
         "@coveo/headless": "2.3.0",
-        "@coveo/search-token-lambda": "1.36.2",
+        "@coveo/search-token-lambda": "1.36.3",
         "@stencil/core": "2.21.0"
       },
       "devDependencies": {
@@ -27432,14 +27558,14 @@
     },
     "packages/ui/cra-template": {
       "name": "@coveo/cra-template",
-      "version": "1.36.3",
+      "version": "1.36.4",
       "license": "Apache-2.0",
       "dependencies": {
         "fs-extra": "10.1.0"
       },
       "devDependencies": {
         "@coveo/headless": "latest",
-        "@coveo/search-token-server": "1.35.18",
+        "@coveo/search-token-server": "1.35.19",
         "@emotion/react": "11.10.5",
         "@emotion/styled": "11.10.5",
         "@mui/material": "5.11.4",
@@ -27467,7 +27593,7 @@
     },
     "packages/ui/search-token-lambda": {
       "name": "@coveo/search-token-lambda",
-      "version": "1.36.2",
+      "version": "1.36.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@coveo/platform-client": "37.13.0",
@@ -27486,7 +27612,7 @@
     },
     "packages/ui/search-token-server": {
       "name": "@coveo/search-token-server",
-      "version": "1.35.18",
+      "version": "1.35.19",
       "license": "Apache-2.0",
       "dependencies": {
         "@coveo/platform-client": "37.13.0",
diff --git a/package.json b/package.json
index 9291f1ce29..6f16da439a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cli-tools",
   "private": true,
-  "version": "1.0.0-8",
+  "version": "1.0.0-9",
   "author": "Coveo",
   "bin": {
     "coveo": "./bin/run"
diff --git a/packages/cli-e2e/package.json b/packages/cli-e2e/package.json
index c3ad0222aa..cb4fbcab5e 100644
--- a/packages/cli-e2e/package.json
+++ b/packages/cli-e2e/package.json
@@ -61,7 +61,7 @@
     "@babel/core": "7.20.12",
     "@babel/preset-env": "7.20.2",
     "@babel/preset-typescript": "7.18.6",
-    "@coveo/cli": "2.2.2",
+    "@coveo/cli": "2.2.3",
     "@coveo/platform-client": "37.13.0",
     "abortcontroller-polyfill": "1.7.5",
     "async-retry": "1.3.3",
diff --git a/packages/cli/commons/CHANGELOG.md b/packages/cli/commons/CHANGELOG.md
index 451ba68804..dfadb54e5c 100644
--- a/packages/cli/commons/CHANGELOG.md
+++ b/packages/cli/commons/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.2.3 (2023-01-12)
+
+### Bug Fixes
+
+- **deps:** update dependency @oclif/core to v1.24.0 j:cdx-227 ([#1082](https://github.com/coveo/cli/issues/1082)) ([41f4867](https://github.com/coveo/cli/commits/41f4867afc0ac2c49b6d87c0d698377f47575912))
+
 ## 2.2.1 (2022-12-14)
 
 ### Bug Fixes
diff --git a/packages/cli/commons/package.json b/packages/cli/commons/package.json
index fe8ed9f3d9..a3b2a841c7 100644
--- a/packages/cli/commons/package.json
+++ b/packages/cli/commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli-commons",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "author": "Coveo",
   "description": "Common utils for @coveo/cli plugins",
   "license": "Apache-2.0",
diff --git a/packages/cli/core/CHANGELOG.md b/packages/cli/core/CHANGELOG.md
index 2a301412f0..4be67d3d2b 100644
--- a/packages/cli/core/CHANGELOG.md
+++ b/packages/cli/core/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.2.3 (2023-01-12)
+
+### Bug Fixes
+
+- **deps:** update dependency @oclif/core to v1.24.0 j:cdx-227 ([#1082](https://github.com/coveo/cli/issues/1082)) ([41f4867](https://github.com/coveo/cli/commits/41f4867afc0ac2c49b6d87c0d698377f47575912))
+- update organization flag ([#1076](https://github.com/coveo/cli/issues/1076)) ([85552b8](https://github.com/coveo/cli/commits/85552b864a08227d90c36bac4e1cf111913d24b0)), closes [#773](https://github.com/coveo/cli/issues/773)
+
 ## 2.2.1 (2022-12-14)
 
 ### Bug Fixes
diff --git a/packages/cli/core/README.md b/packages/cli/core/README.md
index ea80abea22..89af7f2a0d 100644
--- a/packages/cli/core/README.md
+++ b/packages/cli/core/README.md
@@ -23,7 +23,7 @@ $ npm install -g @coveo/cli
 $ coveo COMMAND
 running command...
 $ coveo (--version)
-@coveo/cli/2.2.1 linux-x64 node-v18.12.1
+@coveo/cli/2.2.3 linux-x64 node-v18.13.0
 $ coveo --help [COMMAND]
 USAGE
   $ coveo COMMAND
@@ -120,7 +120,7 @@ EXAMPLES
   $ coveo auth:login
 ```
 
-_See code: [src/commands/auth/login.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/auth/login.ts)_
+_See code: [src/commands/auth/login.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/auth/login.ts)_
 
 ## `coveo auth:token`
 
@@ -146,7 +146,7 @@ EXAMPLES
   $ coveo auth:token
 ```
 
-_See code: [src/commands/auth/token.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/auth/token.ts)_
+_See code: [src/commands/auth/token.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/auth/token.ts)_
 
 ## `coveo config:get [KEY]`
 
@@ -176,7 +176,7 @@ EXAMPLES
     $ coveo config:get accessToken
 ```
 
-_See code: [src/commands/config/get.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/config/get.ts)_
 
 ## `coveo config:set`
 
@@ -199,7 +199,7 @@ EXAMPLES
     $ coveo config:set --organization myOrgId
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/config/set.ts)_
 
 ## `coveo help [COMMAND]`
 
@@ -219,7 +219,7 @@ DESCRIPTION
   Display help for coveo.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.20/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.22/src/commands/help.ts)_
 
 ## `coveo org:create NAME`
 
@@ -239,7 +239,7 @@ DESCRIPTION
   Create a new test Coveo organization.
 ```
 
-_See code: [src/commands/org/create.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/create.ts)_
+_See code: [src/commands/org/create.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/create.ts)_
 
 ## `coveo org:list`
 
@@ -265,7 +265,7 @@ DESCRIPTION
   List Coveo organizations.
 ```
 
-_See code: [src/commands/org/list.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/list.ts)_
+_See code: [src/commands/org/list.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/list.ts)_
 
 ## `coveo org:resources:list`
 
@@ -296,7 +296,7 @@ EXAMPLES
   $ coveo org:resources:list -o=myOrgId
 ```
 
-_See code: [src/commands/org/resources/list.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/resources/list.ts)_
+_See code: [src/commands/org/resources/list.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/resources/list.ts)_
 
 ## `coveo org:resources:model:create`
 
@@ -310,7 +310,7 @@ DESCRIPTION
   Create a Snapshot Pull Model
 ```
 
-_See code: [src/commands/org/resources/model/create.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/resources/model/create.ts)_
+_See code: [src/commands/org/resources/model/create.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/resources/model/create.ts)_
 
 ## `coveo org:resources:monitor SNAPSHOTID`
 
@@ -339,7 +339,7 @@ EXAMPLES
     $ coveo org:resources:monitor --organization myorgid --snapshotId mysnapshotid
 ```
 
-_See code: [src/commands/org/resources/monitor.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/resources/monitor.ts)_
+_See code: [src/commands/org/resources/monitor.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/resources/monitor.ts)_
 
 ## `coveo org:resources:preview`
 
@@ -375,7 +375,7 @@ EXAMPLES
   $ coveo org:resources:preview -o=myOrgId -d
 ```
 
-_See code: [src/commands/org/resources/preview.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/resources/preview.ts)_
+_See code: [src/commands/org/resources/preview.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/resources/preview.ts)_
 
 ## `coveo org:resources:pull`
 
@@ -430,7 +430,7 @@ EXAMPLES
     $ coveo org:resources:pull --resourceTypes QUERY_PIPELINE FIELD,
 ```
 
-_See code: [src/commands/org/resources/pull.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/resources/pull.ts)_
+_See code: [src/commands/org/resources/pull.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/resources/pull.ts)_
 
 ## `coveo org:resources:push`
 
@@ -474,7 +474,7 @@ EXAMPLES
     $ coveo org:resources:push --deleteMissingResources
 ```
 
-_See code: [src/commands/org/resources/push.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/resources/push.ts)_
+_See code: [src/commands/org/resources/push.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/resources/push.ts)_
 
 ## `coveo org:search:dump`
 
@@ -519,7 +519,7 @@ EXAMPLES
     $ coveo org:search:dump --fieldsToExclude ec_description ec_summary
 ```
 
-_See code: [src/commands/org/search/dump.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/org/search/dump.ts)_
+_See code: [src/commands/org/search/dump.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/org/search/dump.ts)_
 
 ## `coveo plugins`
 
@@ -539,7 +539,7 @@ EXAMPLES
   $ coveo plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.8/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.12/src/commands/plugins/index.ts)_
 
 ## `coveo plugins:install PLUGIN...`
 
@@ -601,7 +601,7 @@ EXAMPLES
   $ coveo plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.8/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.12/src/commands/plugins/inspect.ts)_
 
 ## `coveo plugins:install PLUGIN...`
 
@@ -641,7 +641,7 @@ EXAMPLES
   $ coveo plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.8/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.12/src/commands/plugins/install.ts)_
 
 ## `coveo plugins:link PLUGIN`
 
@@ -670,7 +670,7 @@ EXAMPLES
   $ coveo plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.8/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.12/src/commands/plugins/link.ts)_
 
 ## `coveo plugins:uninstall PLUGIN...`
 
@@ -718,7 +718,7 @@ ALIASES
   $ coveo plugins:remove
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.8/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.12/src/commands/plugins/uninstall.ts)_
 
 ## `coveo plugins:uninstall PLUGIN...`
 
@@ -759,7 +759,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.8/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.1.12/src/commands/plugins/update.ts)_
 
 ## `coveo source:catalog:add SOURCEID`
 
@@ -809,7 +809,7 @@ DESCRIPTION
   Index a JSON document into a Coveo Catalog source. See https://docs.coveo.com/en/2956 for more information.
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.2/packages/cli/source/src/commands/source/catalog/add.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.4/packages/cli/source/src/commands/source/catalog/add.ts)_
 
 ## `coveo source:catalog:new NAME`
 
@@ -831,7 +831,7 @@ DESCRIPTION
   Create a new catalog source in a Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.2/packages/cli/source/src/commands/source/catalog/new.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.4/packages/cli/source/src/commands/source/catalog/new.ts)_
 
 ## `coveo source:list`
 
@@ -857,7 +857,7 @@ DESCRIPTION
   List all available push sources in your Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.2/packages/cli/source/src/commands/source/list.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.4/packages/cli/source/src/commands/source/list.ts)_
 
 ## `coveo source:push:add SOURCEID`
 
@@ -888,7 +888,7 @@ DESCRIPTION
   https://github.com/coveo/cli/wiki/Pushing-JSON-Files-with-the-Coveo-CLI for more information.
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.2/packages/cli/source/src/commands/source/push/add.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.4/packages/cli/source/src/commands/source/push/add.ts)_
 
 ## `coveo source:push:delete SOURCEID`
 
@@ -920,7 +920,7 @@ DESCRIPTION
   <https://docs.coveo.com/en/131>
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.2/packages/cli/source/src/commands/source/push/delete.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.4/packages/cli/source/src/commands/source/push/delete.ts)_
 
 ## `coveo source:push:new NAME`
 
@@ -942,7 +942,7 @@ DESCRIPTION
   Create a new push source in a Coveo organization
 ```
 
-_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.2/packages/cli/source/src/commands/source/push/new.ts)_
+_See code: [@coveo/cli-plugin-source](https://github.com/coveo/cli/blob/@coveo/cli@2.0.4/packages/cli/source/src/commands/source/push/new.ts)_
 
 ## `coveo ui:create:angular NAME`
 
@@ -957,14 +957,14 @@ ARGUMENTS
 
 FLAGS
   -d, --defaults         Whether to automatically select the default value for all prompts that have a default value.
-  -v, --version=<value>  [default: 1.35.20] The version of @coveo/angular to use.
+  -v, --version=<value>  [default: 1.35.22] The version of @coveo/angular to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with the Angular web framework. See <https://docs.coveo.com/headless> and
   <https://angular.io/>.
 ```
 
-_See code: [src/commands/ui/create/angular.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/ui/create/angular.ts)_
+_See code: [src/commands/ui/create/angular.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/ui/create/angular.ts)_
 
 ## `coveo ui:create:atomic NAME`
 
@@ -979,7 +979,7 @@ ARGUMENTS
 
 FLAGS
   -p, --pageId=7944ff4a-9943-4999-a3f6-3e81a7f6fb0a  The hosted search page ID.
-  -v, --version=<value>                              [default: 1.36.1] The version of @coveo/create-atomic to use.
+  -v, --version=<value>                              [default: 1.36.3] The version of @coveo/create-atomic to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with Coveo's own Atomic framework. See <https://docs.coveo.com/atomic> and
@@ -989,7 +989,7 @@ EXAMPLES
   $ coveo ui:create:atomic myapp
 ```
 
-_See code: [src/commands/ui/create/atomic.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/ui/create/atomic.ts)_
+_See code: [src/commands/ui/create/atomic.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/ui/create/atomic.ts)_
 
 ## `coveo ui:create:react NAME`
 
@@ -1003,7 +1003,7 @@ ARGUMENTS
   NAME  The name of the application to create.
 
 FLAGS
-  -v, --version=<value>  [default: 1.36.2] Version of @coveo/cra-template to use.
+  -v, --version=<value>  [default: 1.36.4] Version of @coveo/cra-template to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with the React web framework. See <https://docs.coveo.com/headless> and
@@ -1015,7 +1015,7 @@ EXAMPLES
   $ coveo ui:create:react --help
 ```
 
-_See code: [src/commands/ui/create/react.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/ui/create/react.ts)_
+_See code: [src/commands/ui/create/react.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/ui/create/react.ts)_
 
 ## `coveo ui:create:vue NAME`
 
@@ -1029,7 +1029,7 @@ ARGUMENTS
   NAME  The name of the application to create.
 
 FLAGS
-  -v, --version=<value>  [default: 1.0.2] The version of @coveo/create-headless-vue to use.
+  -v, --version=<value>  [default: 1.0.3] The version of @coveo/create-headless-vue to use.
 
 DESCRIPTION
   Create a Coveo Headless-powered search page with the Vue3 and Vite. See <https://docs.coveo.com/headless> and
@@ -1041,7 +1041,7 @@ EXAMPLES
   $ coveo ui:create:vue-v=1.2.3 myVueProject
 ```
 
-_See code: [src/commands/ui/create/vue.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.1/packages/cli/core/src/commands/ui/create/vue.ts)_
+_See code: [src/commands/ui/create/vue.ts](https://github.com/coveo/cli/blob/@coveo/cli@2.2.3/packages/cli/core/src/commands/ui/create/vue.ts)_
 
 ## `coveo update [CHANNEL]`
 
@@ -1078,7 +1078,7 @@ EXAMPLES
     $ coveo update --available
 ```
 
-_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v3.0.8/src/commands/update.ts)_
+_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v3.0.12/src/commands/update.ts)_
 
 ## `coveo version`
 
@@ -1098,6 +1098,6 @@ FLAG DESCRIPTIONS
     Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.
 ```
 
-_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.1.3/src/commands/version.ts)_
+_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.1.4/src/commands/version.ts)_
 
 <!-- commandsstop -->
diff --git a/packages/cli/core/package.json b/packages/cli/core/package.json
index 59aabdd7d8..67607d62cf 100644
--- a/packages/cli/core/package.json
+++ b/packages/cli/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "author": "Coveo",
   "description": "Coveo CLI",
   "engines": {
@@ -9,8 +9,8 @@
   "dependencies": {
     "@amplitude/identify": "^1.9.0",
     "@amplitude/node": "^1.9.0",
-    "@coveo/cli-commons": "2.2.2",
-    "@coveo/cli-plugin-source": "2.0.3",
+    "@coveo/cli-commons": "2.2.3",
+    "@coveo/cli-plugin-source": "2.0.4",
     "@coveo/platform-client": "37.13.0",
     "@coveo/push-api-client": "^2.7.7",
     "@oclif/core": "1.24.0",
@@ -43,10 +43,10 @@
   "devDependencies": {
     "@amplitude/types": "1.10.2",
     "@babel/core": "7.20.12",
-    "@coveo/angular": "1.35.21",
+    "@coveo/angular": "1.35.22",
     "@coveo/cli-commons-dev": "6.0.2",
-    "@coveo/cra-template": "1.36.3",
-    "@coveo/create-atomic": "1.36.2",
+    "@coveo/cra-template": "1.36.4",
+    "@coveo/create-atomic": "1.36.3",
     "@coveo/create-headless-vue": "1.0.3",
     "@oclif/test": "2.2.20",
     "@types/archiver": "5.3.1",
diff --git a/packages/cli/source/CHANGELOG.md b/packages/cli/source/CHANGELOG.md
index b1d05e1784..d64b1303f5 100644
--- a/packages/cli/source/CHANGELOG.md
+++ b/packages/cli/source/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.0.4 (2023-01-12)
+
+### Bug Fixes
+
+- **deps:** update dependency @oclif/core to v1.24.0 j:cdx-227 ([#1082](https://github.com/coveo/cli/issues/1082)) ([41f4867](https://github.com/coveo/cli/commits/41f4867afc0ac2c49b6d87c0d698377f47575912))
+
 ## 2.0.2 (2022-12-14)
 
 ### Bug Fixes
diff --git a/packages/cli/source/package.json b/packages/cli/source/package.json
index 6b757f252b..eb3bc1fd5a 100644
--- a/packages/cli/source/package.json
+++ b/packages/cli/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cli-plugin-source",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Manage Coveo Sources with the Coveo CLI",
   "author": "Coveo",
   "homepage": "https://github.com/coveo/cli",
@@ -14,7 +14,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@coveo/cli-commons": "2.2.2",
+    "@coveo/cli-commons": "2.2.3",
     "@coveo/platform-client": "37.13.0",
     "@coveo/push-api-client": "^2.7.7",
     "@oclif/core": "1.24.0",
diff --git a/packages/ui/angular/CHANGELOG.md b/packages/ui/angular/CHANGELOG.md
index 9b4f7b3c26..90b16e8376 100644
--- a/packages/ui/angular/CHANGELOG.md
+++ b/packages/ui/angular/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.35.22 (2023-01-12)
+
 ## 1.35.20 (2022-12-14)
 
 ### Bug Fixes
diff --git a/packages/ui/angular/package.json b/packages/ui/angular/package.json
index b840409584..69b9f54198 100644
--- a/packages/ui/angular/package.json
+++ b/packages/ui/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/angular",
-  "version": "1.35.21",
+  "version": "1.35.22",
   "description": "Coveo schematic for angular",
   "scripts": {
     "test": "jest",
@@ -26,7 +26,7 @@
     "@angular-devkit/schematics": "^15.0.0",
     "@angular/cdk": "^15.0.0",
     "@angular/cli": "^15.0.0",
-    "@coveo/search-token-server": "1.35.18",
+    "@coveo/search-token-server": "1.35.19",
     "@schematics/angular": "^15.0.0",
     "jest-config": "29.3.1"
   },
diff --git a/packages/ui/atomic/create-atomic/package.json b/packages/ui/atomic/create-atomic/package.json
index c1328a9416..aea11e122a 100644
--- a/packages/ui/atomic/create-atomic/package.json
+++ b/packages/ui/atomic/create-atomic/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coveo/create-atomic",
   "description": "Coveo Atomic Generator",
-  "version": "1.36.2",
+  "version": "1.36.3",
   "files": [
     "/lib",
     "/template",
diff --git a/packages/ui/atomic/template/package.json b/packages/ui/atomic/template/package.json
index ec1e47d5f0..ed53de9201 100644
--- a/packages/ui/atomic/template/package.json
+++ b/packages/ui/atomic/template/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coveo/create-atomic-template",
   "description": "{{titleCase project}} project",
-  "version": "1.36.1",
+  "version": "1.37.0",
   "private": true,
   "scripts": {
     "release:phase1": "node --experimental-specifier-resolution=node ../../../../scripts/releaseV2/phase1-bump-all-packages.mjs",
@@ -10,7 +10,7 @@
   "dependencies": {
     "@coveo/atomic": "2.4.2",
     "@coveo/headless": "2.3.0",
-    "@coveo/search-token-lambda": "1.36.2",
+    "@coveo/search-token-lambda": "1.36.3",
     "@stencil/core": "2.21.0"
   },
   "devDependencies": {
diff --git a/packages/ui/cra-template/package.json b/packages/ui/cra-template/package.json
index bcd268817c..b0803b5e3e 100644
--- a/packages/ui/cra-template/package.json
+++ b/packages/ui/cra-template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/cra-template",
-  "version": "1.36.3",
+  "version": "1.36.4",
   "scripts": {
     "lint": "prettier --check . && eslint .",
     "release:phase1": "node --experimental-specifier-resolution=node ../../../scripts/releaseV2/phase1-bump-all-packages.mjs",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@coveo/headless": "latest",
-    "@coveo/search-token-server": "1.35.18",
+    "@coveo/search-token-server": "1.35.19",
     "@emotion/react": "11.10.5",
     "@emotion/styled": "11.10.5",
     "@mui/material": "5.11.4",
diff --git a/packages/ui/cra-template/template.json b/packages/ui/cra-template/template.json
index ea78b45b2e..dd97ac51e5 100644
--- a/packages/ui/cra-template/template.json
+++ b/packages/ui/cra-template/template.json
@@ -2,7 +2,7 @@
   "package": {
     "dependencies": {
       "@coveo/headless": "latest",
-      "@coveo/search-token-server": "1.35.18",
+      "@coveo/search-token-server": "1.35.19",
       "@mui/material": "5.11.4",
       "@emotion/react": "11.10.5",
       "@emotion/styled": "11.10.5",
diff --git a/packages/ui/search-token-lambda/CHANGELOG.md b/packages/ui/search-token-lambda/CHANGELOG.md
index 6773c30ee2..585f27b7ba 100644
--- a/packages/ui/search-token-lambda/CHANGELOG.md
+++ b/packages/ui/search-token-lambda/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.36.3 (2023-01-12)
+
 ## 1.36.1 (2022-12-14)
 
 ### Bug Fixes
diff --git a/packages/ui/search-token-lambda/package.json b/packages/ui/search-token-lambda/package.json
index 5caa9369b7..aa09d81c6b 100644
--- a/packages/ui/search-token-lambda/package.json
+++ b/packages/ui/search-token-lambda/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coveo/search-token-lambda",
   "author": "Coveo",
-  "version": "1.36.2",
+  "version": "1.36.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/ui/search-token-server/CHANGELOG.md b/packages/ui/search-token-server/CHANGELOG.md
index 71c90ea30f..0e26df5696 100644
--- a/packages/ui/search-token-server/CHANGELOG.md
+++ b/packages/ui/search-token-server/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.35.19 (2023-01-12)
+
 ## 1.35.17 (2022-12-14)
 
 ### Bug Fixes
diff --git a/packages/ui/search-token-server/package.json b/packages/ui/search-token-server/package.json
index d2627a7737..dd29c49445 100644
--- a/packages/ui/search-token-server/package.json
+++ b/packages/ui/search-token-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coveo/search-token-server",
-  "version": "1.35.18",
+  "version": "1.35.19",
   "main": "server.ts",
   "license": "Apache-2.0",
   "repository": {