diff --git a/command-snapshot.json b/command-snapshot.json
index d1d973b3..bb3541a5 100644
--- a/command-snapshot.json
+++ b/command-snapshot.json
@@ -1,50 +1,50 @@
 [
   {
-    "command": "jayree:flow:get:coverage",
-    "plugin": "@jayree/sfdx-plugin-org",
-    "flags": ["api-version", "json", "target-org"],
     "alias": ["jayree:flowtestcoverage"],
+    "command": "jayree:flow:get:coverage",
+    "flagAliases": ["apiversion", "targetusername", "u"],
     "flagChars": ["o"],
-    "flagAliases": ["apiversion", "targetusername", "u"]
+    "flags": ["api-version", "flags-dir", "json", "target-org"],
+    "plugin": "@jayree/sfdx-plugin-org"
   },
   {
-    "command": "jayree:org:configure",
-    "plugin": "@jayree/sfdx-plugin-org",
-    "flags": ["api-version", "concurrent", "json", "target-org", "tasks"],
     "alias": [],
+    "command": "jayree:org:configure",
+    "flagAliases": ["apiversion", "targetusername", "u"],
     "flagChars": ["o", "t"],
-    "flagAliases": ["apiversion", "targetusername", "u"]
+    "flags": ["api-version", "concurrent", "flags-dir", "json", "target-org", "tasks"],
+    "plugin": "@jayree/sfdx-plugin-org"
   },
   {
-    "command": "jayree:org:configure:country",
-    "plugin": "@jayree/sfdx-plugin-org",
-    "flags": ["api-version", "json", "silent", "target-org"],
     "alias": [],
+    "command": "jayree:org:configure:country",
+    "flagAliases": ["apiversion", "targetusername", "u"],
     "flagChars": ["o"],
-    "flagAliases": ["apiversion", "targetusername", "u"]
+    "flags": ["api-version", "flags-dir", "json", "silent", "target-org"],
+    "plugin": "@jayree/sfdx-plugin-org"
   },
   {
-    "command": "jayree:org:configure:state",
-    "plugin": "@jayree/sfdx-plugin-org",
-    "flags": ["api-version", "category", "concurrent", "country-code", "json", "language", "target-org"],
     "alias": [],
+    "command": "jayree:org:configure:state",
+    "flagAliases": ["apiversion", "countrycode", "targetusername", "u"],
     "flagChars": ["o"],
-    "flagAliases": ["apiversion", "countrycode", "targetusername", "u"]
+    "flags": ["api-version", "category", "concurrent", "country-code", "flags-dir", "json", "language", "target-org"],
+    "plugin": "@jayree/sfdx-plugin-org"
   },
   {
-    "command": "jayree:org:get:settings",
-    "plugin": "@jayree/sfdx-plugin-org",
-    "flags": ["api-version", "file", "json", "target-org", "writetoprojectscratchdeffile"],
     "alias": ["jayree:org:settings"],
+    "command": "jayree:org:get:settings",
+    "flagAliases": ["apiversion", "targetusername", "u"],
     "flagChars": ["f", "o", "w"],
-    "flagAliases": ["apiversion", "targetusername", "u"]
+    "flags": ["api-version", "file", "flags-dir", "json", "target-org", "writetoprojectscratchdeffile"],
+    "plugin": "@jayree/sfdx-plugin-org"
   },
   {
-    "command": "jayree:org:stream",
-    "plugin": "@jayree/sfdx-plugin-org",
-    "flags": ["api-version", "channel", "json", "replay-id", "target-org"],
     "alias": ["jayree:org:streaming"],
+    "command": "jayree:org:stream",
+    "flagAliases": ["apiversion", "p", "targetusername", "topic", "u"],
     "flagChars": ["c", "o", "r"],
-    "flagAliases": ["apiversion", "p", "targetusername", "topic", "u"]
+    "flags": ["api-version", "channel", "flags-dir", "json", "replay-id", "target-org"],
+    "plugin": "@jayree/sfdx-plugin-org"
   }
 ]
diff --git a/package.json b/package.json
index 7021b5ab..d90bbee8 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@listr2/prompt-adapter-enquirer": "^2.0.4",
     "@oclif/core": "^3.25.3",
     "@salesforce/core": "^6.7.1",
-    "@salesforce/sf-plugins-core": "^7.1.16",
+    "@salesforce/sf-plugins-core": "^8.0.2",
     "@salesforce/source-deploy-retrieve": "^10.6.1",
     "@salesforce/ts-types": "^2.0.9",
     "chalk": "^5.3.0",
diff --git a/yarn.lock b/yarn.lock
index 688c9874..aabe222a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1313,7 +1313,7 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@oclif/core@3.26.0", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0", "@oclif/core@^3.25.3", "@oclif/core@^3.26.0":
+"@oclif/core@3.26.0", "@oclif/core@^3.21.0", "@oclif/core@^3.25.3", "@oclif/core@^3.26.0":
   version "3.26.0"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.0.tgz#959d5e9f13f4ad6a4e98235ad125189df9ee4279"
   integrity sha512-TpMdfD4tfA2tVVbd4l0PrP02o5KoUXYmudBbTC7CeguDo/GLoprw4uL8cMsaVA26+cbcy7WYtOEydQiHVtJixA==
@@ -1400,7 +1400,7 @@
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
-"@salesforce/core@^6.6.0", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.1", "@salesforce/core@^6.7.3":
+"@salesforce/core@^6.7.0", "@salesforce/core@^6.7.1", "@salesforce/core@^6.7.3":
   version "6.7.3"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.7.3.tgz#5d8f30c40ac3cebb898c8e845fe9a067bc729268"
   integrity sha512-uU+PuZZGXxByhvnXLH1V3eY5P1caw401dIZ/QvhzYxoP/alPLk7dpChnZNJYH5Rw3dc/AhSPw+eg0cvUyjhP1Q==
@@ -1479,15 +1479,15 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d"
   integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==
 
-"@salesforce/sf-plugins-core@^7.1.16":
-  version "7.1.16"
-  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-7.1.16.tgz#a68673560f01421ac18a0bc1d4687abc35e11234"
-  integrity sha512-v135A7TG1n97eFoh0j96kbHKbivXbbd7M5url3L0I5lJsCGGF+mMSL2Tpm8FNUN8DCLOGkvymR1s2QmNzMR7Tw==
+"@salesforce/sf-plugins-core@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-8.0.2.tgz#151437df675ff498110cffe00033cd8dcddce4a2"
+  integrity sha512-/93DgM7eCqXYP91bJz/gQ9KsumNoqRPp5DZoltrhM3JPo1a5J6LwfITw56aEvERY+LeTVubH3wwpQuzt0+8nLg==
   dependencies:
     "@inquirer/confirm" "^2.0.17"
     "@inquirer/password" "^1.1.16"
-    "@oclif/core" "^3.23.0"
-    "@salesforce/core" "^6.6.0"
+    "@oclif/core" "^3.26.0"
+    "@salesforce/core" "^6.7.3"
     "@salesforce/kit" "^3.0.15"
     "@salesforce/ts-types" "^2.0.9"
     chalk "^5.3.0"