diff --git a/.github/workflows/npm-publish-canary.yaml b/.github/workflows/npm-publish-canary.yaml
index 838f8542..914e4acc 100644
--- a/.github/workflows/npm-publish-canary.yaml
+++ b/.github/workflows/npm-publish-canary.yaml
@@ -22,7 +22,11 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: '18.x'
-        cache: yarn
+        # cache: yarn
+
+    - run: |
+        rm -rf node_modules packages/*/node_modules
+        find `yarn cache dir` -maxdepth 1 -name '*oclif*' -delete
 
     - run: yarn
 
diff --git a/package.json b/package.json
index 987b3b9b..f6a904cd 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,9 @@
     "syncpack": "^9.8.4",
     "typescript": "^5.0.4"
   },
+  "resolutions": {
+    "**/@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-9"
+  },
   "lint-staged": {
     "*.{ts,tsx}": [
       "eslint --cache --fix"
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index f55f8465..d489f2e1 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -8,7 +8,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@preevy/core": "0.0.56",
     "chalk": "^4.1.2",
     "iter-tools-es": "^7.5.3",
diff --git a/packages/cli-common/src/commands/base-command.ts b/packages/cli-common/src/commands/base-command.ts
index a1459300..1e4a3951 100644
--- a/packages/cli-common/src/commands/base-command.ts
+++ b/packages/cli-common/src/commands/base-command.ts
@@ -114,6 +114,7 @@ abstract class BaseCommand<T extends typeof Command=typeof Command> extends Comm
     })
     emitter.unref()
     await emitter.flush()
+    // eslint-disable-next-line @typescript-eslint/return-await
     return await super.catch(error)
   }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 78db40d0..a26b7dba 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -15,12 +15,11 @@
     "/static",
     "/dist",
     "/yarn.lock",
-    "/oclif.manifest.json",
-    "/patches"
+    "/oclif.manifest.json"
   ],
   "dependencies": {
     "@inquirer/confirm": "^2.0.14",
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@oclif/plugin-help": "^5",
     "@preevy/cli-common": "0.0.56",
     "@preevy/common": "0.0.56",
@@ -39,6 +38,7 @@
     "yaml": "^2.3.2"
   },
   "devDependencies": {
+    "@types/cli-progress": "^3.11.5",
     "@types/inquirer": "^8.0.0",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
     "@types/lodash": "^4.14.192",
@@ -96,7 +96,6 @@
       "dist/hooks/**/*.js"
     ]
   },
-  "bundleDependencies": ["@oclif/core"],
   "scripts": {
     "build": "yarn clean && tsc -b",
     "clean": "shx rm -rf dist",
diff --git a/packages/cli/validate-tsconfig.js b/packages/cli/validate-tsconfig.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/packages/driver-azure/package.json b/packages/driver-azure/package.json
index 3e8ea21f..e89b3684 100644
--- a/packages/driver-azure/package.json
+++ b/packages/driver-azure/package.json
@@ -17,7 +17,7 @@
     "@azure/arm-subscriptions": "^5.1.0",
     "@azure/identity": "^3.2.2",
     "@azure/logger": "^1.0.4",
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@preevy/core": "0.0.56",
     "inquirer": "^8.0.0",
     "inquirer-autocomplete-prompt": "^2.0.0",
diff --git a/packages/driver-gce/package.json b/packages/driver-gce/package.json
index 660e94c1..a7747f80 100644
--- a/packages/driver-gce/package.json
+++ b/packages/driver-gce/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@google-cloud/compute": "^4.0.1",
     "@google-cloud/storage": "^6.9.5",
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@preevy/core": "0.0.56",
     "google-auth-library": "^8.7.0",
     "google-gax": "^4.0.4",
diff --git a/packages/driver-kube-pod/package.json b/packages/driver-kube-pod/package.json
index 07c1a339..36169d6c 100644
--- a/packages/driver-kube-pod/package.json
+++ b/packages/driver-kube-pod/package.json
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@kubernetes/client-node": "^0.18.1",
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@preevy/common": "0.0.56",
     "@preevy/core": "0.0.56",
     "fast-safe-stringify": "^2.1.1",
diff --git a/packages/driver-lightsail/package.json b/packages/driver-lightsail/package.json
index 502432d9..411abef3 100644
--- a/packages/driver-lightsail/package.json
+++ b/packages/driver-lightsail/package.json
@@ -14,7 +14,7 @@
     "@aws-sdk/client-s3": "^3.271.0",
     "@aws-sdk/client-sts": "^3.289.0",
     "@aws-sdk/util-waiter": "^3.271.0",
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@preevy/core": "0.0.56",
     "inquirer": "^8.0.0",
     "inquirer-autocomplete-prompt": "^2.0.0",
diff --git a/packages/plugin-github/package.json b/packages/plugin-github/package.json
index 9f03bed8..e3b8e62d 100644
--- a/packages/plugin-github/package.json
+++ b/packages/plugin-github/package.json
@@ -8,7 +8,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@oclif/core": "livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3",
+    "@oclif/core": "3.12.0",
     "@preevy/cli-common": "0.0.56",
     "@preevy/core": "0.0.56",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index 17c454fb..e02c109c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2528,43 +2528,9 @@
   dependencies:
     nx "15.9.4"
 
-"@oclif/core@^2.15.0":
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.15.0.tgz#f27797b30a77d13279fba88c1698fc34a0bd0d2a"
-  integrity sha512-fNEMG5DzJHhYmI3MgpByTvltBOMyFcnRIUMxbiz2ai8rhaYgaTHMG3Q38HcosfIvtw9nCjxpcQtC8MN8QtVCcA==
-  dependencies:
-    "@types/cli-progress" "^3.11.0"
-    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.12.0"
-    debug "^4.3.4"
-    ejs "^3.1.8"
-    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"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    supports-color "^8.1.1"
-    supports-hyperlinks "^2.2.0"
-    ts-node "^10.9.1"
-    tslib "^2.5.0"
-    widest-line "^3.1.0"
-    wordwrap "^1.0.0"
-    wrap-ansi "^7.0.0"
-
-"@oclif/core@^3.0.4", "@oclif/core@^3.11.0":
+"@oclif/core@3.12.0", "@oclif/core@^3.0.4", "@oclif/core@^3.11.0":
   version "3.12.0"
-  resolved "https://codeload.github.com/livecycle/oclif-core-patched-for-preevy/tar.gz/dab8b2ff6fb68b264d6633679826e7b6f9d428f6"
+  resolved "https://codeload.github.com/livecycle/oclif-core-patched-for-preevy/tar.gz/a76886f9c73fbedc4d18d43134387aadc53ca4f3"
   dependencies:
     ansi-escapes "^4.3.2"
     ansi-styles "^4.3.0"
@@ -2594,19 +2560,20 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/core@livecycle/oclif-core-patched-for-preevy#v3.12.0-preevy-patch-3":
-  version "3.12.0"
-  resolved "https://codeload.github.com/livecycle/oclif-core-patched-for-preevy/tar.gz/e1512411d926d0d74071758718de3e8c7079fb3d"
+"@oclif/core@^2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.15.0.tgz#f27797b30a77d13279fba88c1698fc34a0bd0d2a"
+  integrity sha512-fNEMG5DzJHhYmI3MgpByTvltBOMyFcnRIUMxbiz2ai8rhaYgaTHMG3Q38HcosfIvtw9nCjxpcQtC8MN8QtVCcA==
   dependencies:
+    "@types/cli-progress" "^3.11.0"
     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.12.0"
-    color "^4.2.3"
     debug "^4.3.4"
-    ejs "^3.1.9"
+    ejs "^3.1.8"
     get-package-type "^0.1.0"
     globby "^11.1.0"
     hyperlinker "^1.0.0"
@@ -2621,7 +2588,8 @@
     strip-ansi "^6.0.1"
     supports-color "^8.1.1"
     supports-hyperlinks "^2.2.0"
-    tsconfck "^3.0.0"
+    ts-node "^10.9.1"
+    tslib "^2.5.0"
     widest-line "^3.1.0"
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
@@ -3820,10 +3788,10 @@
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
   integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
 
-"@types/cli-progress@^3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.0.tgz#ec79df99b26757c3d1c7170af8422e0fc95eef7e"
-  integrity sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==
+"@types/cli-progress@^3.11.0", "@types/cli-progress@^3.11.5":
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.5.tgz#9518c745e78557efda057e3f96a5990c717268c3"
+  integrity sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==
   dependencies:
     "@types/node" "*"