diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 5e1e661b..8695b82d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -14,7 +14,7 @@
         "@balena/dockerignore": "^1.0.2",
         "@balena/env-parsing": "^1.1.8",
         "@balena/es-version": "^1.0.1",
-        "@oclif/core": "^4.0.25",
+        "@oclif/core": "^4.0.31",
         "@sentry/node": "^6.16.1",
         "balena-config-json": "^4.2.0",
         "balena-device-init": "^7.0.1",
@@ -1264,9 +1264,9 @@
       "dev": true
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.0.tgz",
-      "integrity": "sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==",
+      "version": "7.26.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.1.tgz",
+      "integrity": "sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.26.0"
@@ -2452,9 +2452,9 @@
       }
     },
     "node_modules/@oclif/core": {
-      "version": "4.0.25",
-      "resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.0.25.tgz",
-      "integrity": "sha512-3rX1dA40cZWzH6NKcNJGXrJn30XaxnkFXfapLMX0wwSWvBfXE/zIduHt03kLRxeFuEBUR5FBnU64odDWKhtFKg==",
+      "version": "4.0.31",
+      "resolved": "https://registry.npmjs.org/@oclif/core/-/core-4.0.31.tgz",
+      "integrity": "sha512-7oyIZv/C1TP+fPc2tSzVPYqG1zU+nel1QvJxjAWyVhud0J8B5SpKZnryedxs3nlSVPJ6K1MT31C9esupCBYgZw==",
       "dependencies": {
         "ansi-escapes": "^4.3.2",
         "ansis": "^3.3.2",
@@ -3936,9 +3936,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.17.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.1.tgz",
-      "integrity": "sha512-j2VlPv1NnwPJbaCNv69FO/1z4lId0QmGvpT41YxitRtWlg96g/j8qcv2RKsLKe2F6OJgyXhupN1Xo17b2m139Q==",
+      "version": "20.17.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.2.tgz",
+      "integrity": "sha512-OOHK4sjXqkL7yQ7VEEHcf6+0jSvKjWqwnaCtY7AKD/VLEvRHMsxxu7eI8ErnjxHS8VwmekD4PeVCpu4qZEZSxg==",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -5611,10 +5611,9 @@
       }
     },
     "node_modules/balena-sdk/node_modules/@types/node": {
-      "version": "18.19.59",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.59.tgz",
-      "integrity": "sha512-vizm2EqwV/7Zay+A6J3tGl9Lhr7CjZe2HmWS988sefiEmsyP9CeXEleho6i4hJk/8UtZAo0bWN4QPZZr83RxvQ==",
-      "license": "MIT",
+      "version": "18.19.60",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.60.tgz",
+      "integrity": "sha512-cYRj7igVqgxhlHFdBHHpU2SNw3+dN2x0VTZJtLYk6y/ieuGN4XiBgtDjYVktM/yk2y/8pKMileNc6IoEzEJnUw==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
diff --git a/package.json b/package.json
index 8abbdfc9..42288d91 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "@balena/dockerignore": "^1.0.2",
     "@balena/env-parsing": "^1.1.8",
     "@balena/es-version": "^1.0.1",
-    "@oclif/core": "^4.0.25",
+    "@oclif/core": "^4.0.31",
     "@sentry/node": "^6.16.1",
     "balena-config-json": "^4.2.0",
     "balena-device-init": "^7.0.1",
diff --git a/patches/all/@oclif+core+4.0.18.patch b/patches/all/@oclif+core+4.0.31.patch
similarity index 97%
rename from patches/all/@oclif+core+4.0.18.patch
rename to patches/all/@oclif+core+4.0.31.patch
index 2520625d..8962cb22 100644
--- a/patches/all/@oclif+core+4.0.18.patch
+++ b/patches/all/@oclif+core+4.0.31.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@oclif/core/lib/help/command.js b/node_modules/@oclif/core/lib/help/command.js
-index 90922c8..6b7f417 100644
+index 33105a0..0436982 100644
 --- a/node_modules/@oclif/core/lib/help/command.js
 +++ b/node_modules/@oclif/core/lib/help/command.js
 @@ -58,7 +58,8 @@ class CommandHelp extends formatter_1.HelpFormatter {
@@ -13,10 +13,10 @@ index 90922c8..6b7f417 100644
              if (a.default)
                  description = `${(0, theme_1.colorize)(this.config?.theme?.flagDefaultValue, `[default: ${a.default}]`)} ${description}`;
 diff --git a/node_modules/@oclif/core/lib/help/index.js b/node_modules/@oclif/core/lib/help/index.js
-index 4a34b89..d7eb6ac 100644
+index 0b48c0e..ff4fed4 100644
 --- a/node_modules/@oclif/core/lib/help/index.js
 +++ b/node_modules/@oclif/core/lib/help/index.js
-@@ -172,11 +172,12 @@ class Help extends HelpBase {
+@@ -173,11 +173,12 @@ class Help extends HelpBase {
          }
          this.log(this.formatCommand(command));
          this.log('');