diff --git a/src/commands/analytics/cmd-analytics.test.ts b/src/commands/analytics/cmd-analytics.test.ts
index b4fc6ed3..234dbdfd 100644
--- a/src/commands/analytics/cmd-analytics.test.ts
+++ b/src/commands/analytics/cmd-analytics.test.ts
@@ -75,8 +75,6 @@ describe('socket analytics', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Scope must be "repo" or "org" (\\x1b[32mok\\x1b[39m)
-
           - The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)"
@@ -89,7 +87,6 @@ describe('socket analytics', async () => {
   cmdit(
     [
       'analytics',
-      'boo',
       '--scope',
       'org',
       '--repo',
@@ -113,4 +110,302 @@ describe('socket analytics', async () => {
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
     }
   )
+
+  cmdit(
+    ['analytics', '--help', '--config', '{"isTestingV1": true}'],
+    'should support --help in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(
+        `
+        "Look up analytics data
+
+          Usage
+            $ socket analytics [ org | repo <reponame>] [time]
+
+          API Token Requirements
+            - Quota: 1 unit
+            - Permissions: report:write
+
+          The scope is either org or repo level, defaults to org.
+
+          When scope is repo, a repo slug must be given as well.
+
+          The time argument must be number 7, 30, or 90 and defaults to 7.
+
+          Options
+            --file            Filepath to save output. Only valid with --json/--markdown. Defaults to stdout.
+            --help            Print this help
+            --json            Output result as json
+            --markdown        Output result as markdown
+            --repo            Name of the repository. Only valid when scope=repo
+            --scope           Scope of the analytics data - either 'org' or 'repo', default: org
+            --time            Time filter - either 7, 30 or 90, default: 7
+
+          Examples
+            $ socket analytics org 7
+            $ socket analytics repo test-repo 30
+            $ socket analytics 90"
+      `
+      )
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'help should exit with code 2').toBe(2)
+      expect(stderr, 'banner includes base command').toContain(
+        '`socket analytics`'
+      )
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should run to dryrun without args in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      'org',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept org arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      'repo',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should ask for repo name with repo arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`""`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
+
+          - Scope must be "repo" or "org" (\\x1b[32mok\\x1b[39m)
+
+          - When scope=repo, repo name should be the second argument (\\x1b[31mmissing\\x1b[39m)
+
+          - The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)"
+      `)
+
+      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      'repo',
+      'daname',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept repo with arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      '7',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept time 7 arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      '30',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept time 30 arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      '90',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept time 90 arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      'org',
+      '7',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept org and time arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'analytics',
+      'repo',
+      'slowpo',
+      '30',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept repo and time arg in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
 })
diff --git a/src/commands/analytics/cmd-analytics.ts b/src/commands/analytics/cmd-analytics.ts
index 8de228d7..9e5e5d2b 100644
--- a/src/commands/analytics/cmd-analytics.ts
+++ b/src/commands/analytics/cmd-analytics.ts
@@ -1,10 +1,9 @@
-import assert from 'node:assert'
-
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { displayAnalytics } from './display-analytics'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
+import { isTestingV1 } from '../../utils/config'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -48,25 +47,34 @@ const config: CliCommandConfig = {
       description: 'Time filter - either 7, 30 or 90, default: 7'
     }
   },
-  help: (command, { flags }) => `
+  help: (command, { flags }) =>
+    `
     Usage
-      $ ${command} --scope=<scope> --time=<time filter>
+      $ ${command} ${isTestingV1() ? '[ org | repo <reponame>] [time]' : '--scope=<scope> --time=<time filter>'}
 
     API Token Requirements
       - Quota: 1 unit
       - Permissions: report:write
 
-    Default parameters are set to show the organization-level analytics over the
-    last 7 days.
+    ${isTestingV1() ? '' : 'Default parameters are set to show the organization-level analytics over the'}
+    ${isTestingV1() ? '' : 'last 7 days.'}
+
+    ${isTestingV1() ? 'The scope is either org or repo level, defaults to org.' : ''}
+
+    ${isTestingV1() ? 'When scope is repo, a repo slug must be given as well.' : ''}
+
+    ${isTestingV1() ? 'The time argument must be number 7, 30, or 90 and defaults to 7.' : ''}
 
     Options
       ${getFlagListOutput(flags, 6)}
 
     Examples
-      $ ${command} --scope=org --time=7
-      $ ${command} --scope=org --time=30
-      $ ${command} --scope=repo --repo=test-repo --time=30
+      $ ${command} ${isTestingV1() ? 'org 7' : '--scope=org --time=7'}
+      $ ${command} ${isTestingV1() ? 'repo test-repo 30' : '--scope=org --time=30'}
+      $ ${command} ${isTestingV1() ? '90' : '--scope=repo --repo=test-repo --time=30'}
   `
+      // Drop consecutive empty lines. Temporarily necessary to deal with v1 prep.
+      .replace(/\n(?: *\n)+/g, '\n\n')
 }
 
 export const cmdAnalytics = {
@@ -87,30 +95,89 @@ async function run(
     parentName
   })
 
-  const { file, json, markdown, repo, scope, time } = cli.flags
+  const { file, json, markdown } = cli.flags
+
+  // In v1 mode support:
+  // - []        (no args)
+  // - ['org']
+  // - ['org', '30']
+  // - ['repo', 'name']
+  // - ['repo', 'name', '30']
+  // - ['30']
+  // Validate final values in the next step
+  let scope = 'org'
+  let time = isTestingV1() ? '7' : 7
+  let repoName = ''
+  if (isTestingV1()) {
+    if (cli.input[0] === 'org') {
+      if (cli.input[1]) {
+        time = cli.input[1]
+      }
+    } else if (cli.input[0] === 'repo') {
+      scope = 'repo'
+      if (cli.input[1]) {
+        repoName = cli.input[1]
+      }
+      if (cli.input[2]) {
+        time = cli.input[2]
+      }
+    } else if (cli.input[0]) {
+      time = cli.input[0]
+    }
+  } else {
+    if (cli.flags['scope']) {
+      scope = String(cli.flags['scope'] || '')
+    }
+    if (scope === 'repo') {
+      repoName = String(cli.flags['repoName'] || '')
+    }
+    if (cli.flags['time']) {
+      time = Number(cli.flags['time'] || 7)
+    }
+  }
 
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
+      // In v1 this can't go wrong anymore since the unknown value goes to time
+      nook: !isTestingV1(),
       test: scope === 'org' || scope === 'repo',
       message: 'Scope must be "repo" or "org"',
       pass: 'ok',
       fail: 'bad'
     },
     {
-      test: time === 7 || time === 30 || time === 90,
-      message: 'The time filter must either be 7, 30 or 90',
+      nook: true,
+      test: scope === 'org' || !!repoName,
+      message: isTestingV1()
+        ? 'When scope=repo, repo name should be the second argument'
+        : 'When scope=repo, repo name should be set through --repo',
       pass: 'ok',
-      fail: 'bad'
+      fail: 'missing'
     },
     {
       nook: true,
-      test: scope === 'org' || !!repo,
-      message: 'When scope=repo, repo name should be set through --repo',
+      test:
+        scope === 'org' ||
+        (isTestingV1() &&
+          repoName !== '7' &&
+          repoName !== '30' &&
+          repoName !== '90'),
+      message: 'Missing the repo name as second argument',
       pass: 'ok',
       fail: 'missing'
     },
+    {
+      test: isTestingV1()
+        ? time === '7' || time === '30' || time === '90'
+        : time === 7 || time === 30 || time === 90,
+      message: 'The time filter must either be 7, 30 or 90',
+      pass: 'ok',
+      fail: isTestingV1()
+        ? 'invalid range set, see --help for command arg details.'
+        : 'bad'
+    },
     {
       nook: true,
       test: file === '-' || !!json || !!markdown,
@@ -145,22 +212,11 @@ async function run(
     return
   }
 
-  assert(assertScope(scope))
-  assert(assertTime(time))
-
   return await displayAnalytics({
     scope,
-    time,
-    repo: String(repo || ''),
+    time: time === '90' ? 90 : time === '30' ? 30 : 7,
+    repo: repoName,
     outputKind: json ? 'json' : markdown ? 'markdown' : 'print',
     filePath: String(file || '')
   })
 }
-
-function assertScope(scope: unknown): scope is 'org' | 'repo' {
-  return scope === 'org' || scope === 'repo'
-}
-
-function assertTime(time: unknown): time is 7 | 30 | 90 {
-  return time === 7 || time === 30 || time === 90
-}
diff --git a/src/commands/audit-log/cmd-audit-log.test.ts b/src/commands/audit-log/cmd-audit-log.test.ts
index 3cc3c5a7..8e032703 100644
--- a/src/commands/audit-log/cmd-audit-log.test.ts
+++ b/src/commands/audit-log/cmd-audit-log.test.ts
@@ -32,8 +32,10 @@ describe('socket audit-log', async () => {
 
           Options
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
             --page            Page number - default is 1
             --perPage         Results per page - default is 30
             --type            Type of log event
@@ -72,7 +74,7 @@ describe('socket audit-log', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name should be the first arg (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)"
       `)
@@ -104,4 +106,87 @@ describe('socket audit-log', async () => {
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
     }
   )
+
+  cmdit(
+    [
+      'audit-log',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should report missing org name in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`""`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m
+        Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
+
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)"
+      `)
+
+      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+    }
+  )
+
+  cmdit(
+    [
+      'audit-log',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}'
+    ],
+    'should accept default org in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'audit-log',
+      '--org',
+      'forcedorg',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept --org flag in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
 })
diff --git a/src/commands/audit-log/cmd-audit-log.ts b/src/commands/audit-log/cmd-audit-log.ts
index 3e68c2d0..4ce7f713 100644
--- a/src/commands/audit-log/cmd-audit-log.ts
+++ b/src/commands/audit-log/cmd-audit-log.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleAuditLog } from './handle-audit-log'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -18,6 +19,19 @@ const config: CliCommandConfig = {
   description: 'Look up the audit log for an organization',
   hidden: false,
   flags: {
+    ...commonFlags,
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     type: {
       type: 'string',
       shortFlag: 't',
@@ -35,13 +49,11 @@ const config: CliCommandConfig = {
       shortFlag: 'p',
       default: 1,
       description: 'Page number - default is 1'
-    },
-    ...commonFlags,
-    ...outputFlags
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} ${isTestingV1() ? '<repo>' : '<org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -54,7 +66,7 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${isTestingV1() ? '' : 'FakeOrg'}
   `
 }
 
@@ -76,18 +88,34 @@ async function run(
     parentName
   })
 
-  const { json, markdown, page, perPage, type } = cli.flags
+  const {
+    dryRun,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag,
+    page,
+    perPage,
+    type
+  } = cli.flags
   const logType = String(type || '')
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
+      nook: true,
       test: !!orgSlug,
-      message: 'Org name should be the first arg',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
diff --git a/src/commands/cdxgen/cmd-cdxgen.test.ts b/src/commands/cdxgen/cmd-cdxgen.test.ts
index f43fa794..e637386a 100644
--- a/src/commands/cdxgen/cmd-cdxgen.test.ts
+++ b/src/commands/cdxgen/cmd-cdxgen.test.ts
@@ -75,9 +75,11 @@ describe('socket cdxgen', async () => {
     expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
       "
          _____         _       _        /---------------
-        |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+        |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
         |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-        |_____|___|___|_,_|___|_|.dev   | Command: \`socket cdxgen\`, cwd: <redacted>"
+        |_____|___|___|_,_|___|_|.dev   | Command: \`socket cdxgen\`, cwd: <redacted>
+      \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+      \\x1b[39m"
     `)
 
     // expect(code, 'help should exit with code 2').toBe(2)
diff --git a/src/commands/config/cmd-config.test.ts b/src/commands/config/cmd-config.test.ts
index 6e19a1c6..36c62dd7 100644
--- a/src/commands/config/cmd-config.test.ts
+++ b/src/commands/config/cmd-config.test.ts
@@ -82,10 +82,11 @@ describe('socket config', async () => {
         expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
           "
              _____         _       _        /---------------
-            |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+            |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
             |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket\`, cwd: <redacted>
-
+          \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+          \\x1b[39m
           \\x1b[31m\\xd7\\x1b[39m Could not JSON parse the config override. Make sure it's a proper JSON object (double-quoted keys and strings, no unquoted \`undefined\`) and try again."
         `)
 
diff --git a/src/commands/diff-scan/cmd-diff-scan-get.test.ts b/src/commands/diff-scan/cmd-diff-scan-get.test.ts
index 32a1bb21..82dc86a0 100644
--- a/src/commands/diff-scan/cmd-diff-scan-get.test.ts
+++ b/src/commands/diff-scan/cmd-diff-scan-get.test.ts
@@ -20,6 +20,9 @@ describe('socket diff-scan get', async () => {
         `
         "Get a diff scan for an organization
 
+          Note: This command is deprecated, to be dropped in the next major bump.
+                Please see \`socket scan diff\`
+
           Usage
             $ socket diff-scan get <org slug> --before=<before> --after=<after>
 
diff --git a/src/commands/diff-scan/cmd-diff-scan-get.ts b/src/commands/diff-scan/cmd-diff-scan-get.ts
index 34794833..87ee5ee2 100644
--- a/src/commands/diff-scan/cmd-diff-scan-get.ts
+++ b/src/commands/diff-scan/cmd-diff-scan-get.ts
@@ -3,7 +3,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleDiffScan } from './handle-diff-scan'
 import constants from '../../constants'
 import { commonFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { getConfigValue, isTestingV1 } from '../../utils/config'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -52,7 +52,13 @@ const config: CliCommandConfig = {
         'Path to a local file where the output should be saved. Use `-` to force stdout.'
     }
   },
-  help: (command, config) => `
+  help: (command, config) =>
+    isTestingV1()
+      ? 'This command will be removed in v1'
+      : `
+    Note: This command is deprecated, to be dropped in the next major bump.
+          Please see \`socket scan diff\`
+
     Usage
       $ ${command} <org slug> --before=<before> --after=<after>
 
diff --git a/src/commands/fix/cmd-fix.test.ts b/src/commands/fix/cmd-fix.test.ts
index 5aef69a0..dad7fb1b 100644
--- a/src/commands/fix/cmd-fix.test.ts
+++ b/src/commands/fix/cmd-fix.test.ts
@@ -42,12 +42,14 @@ describe('socket fix', async () => {
     `
     )
     expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket fix\`, cwd: <redacted>"
-      `)
+      "
+         _____         _       _        /---------------
+        |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+        |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+        |_____|___|___|_,_|___|_|.dev   | Command: \`socket fix\`, cwd: <redacted>
+      \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+      \\x1b[39m"
+    `)
 
     expect(code, 'help should exit with code 2').toBe(2)
     expect(stderr, 'banner includes base command').toContain('`socket fix`')
diff --git a/src/commands/info/cmd-info.ts b/src/commands/info/cmd-info.ts
index 32b1389f..9a6e8984 100644
--- a/src/commands/info/cmd-info.ts
+++ b/src/commands/info/cmd-info.ts
@@ -3,6 +3,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handlePackageInfo } from './handle-package-info'
 import constants from '../../constants'
 import { commonFlags, outputFlags, validationFlags } from '../../flags'
+import { isTestingV1 } from '../../utils/config'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -20,7 +21,10 @@ const config: CliCommandConfig = {
     ...outputFlags,
     ...validationFlags
   },
-  help: (command, config) => `
+  help: (command, config) =>
+    isTestingV1()
+      ? 'This command will be removed in v1'
+      : `
     Usage
       $ ${command} <name>
 
diff --git a/src/commands/organization/cmd-organization-policy-license.test.ts b/src/commands/organization/cmd-organization-policy-license.test.ts
index 1146c881..54f6098c 100644
--- a/src/commands/organization/cmd-organization-policy-license.test.ts
+++ b/src/commands/organization/cmd-organization-policy-license.test.ts
@@ -29,8 +29,10 @@ describe('socket organization policy license', async () => {
 
           Options
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
 
           Your API token will need the \`license-policy:read\` permission otherwise
           the request will fail with an authentication error.
@@ -70,7 +72,7 @@ describe('socket organization policy license', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)"
       `)
@@ -104,4 +106,93 @@ describe('socket organization policy license', async () => {
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
     }
   )
+
+  cmdit(
+    [
+      'organization',
+      'policy',
+      'license',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should report missing org name in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`""`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m
+        Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
+
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)"
+      `)
+
+      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+    }
+  )
+
+  cmdit(
+    [
+      'organization',
+      'policy',
+      'license',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}'
+    ],
+    'should accept default org in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'organization',
+      'policy',
+      'license',
+      '--org',
+      'forcedorg',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept --org flag in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
 })
diff --git a/src/commands/organization/cmd-organization-policy-license.ts b/src/commands/organization/cmd-organization-policy-license.ts
index df8b3823..9053b2d8 100644
--- a/src/commands/organization/cmd-organization-policy-license.ts
+++ b/src/commands/organization/cmd-organization-policy-license.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleLicensePolicy } from './handle-license-policy'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -20,11 +21,22 @@ const config: CliCommandConfig = {
   hidden: true,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, _config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -37,8 +49,8 @@ const config: CliCommandConfig = {
     the request will fail with an authentication error.
 
     Examples
-      $ ${command} mycorp
-      $ ${command} mycorp --json
+      $ ${command}${isTestingV1() ? '' : ' mycorp'}
+      $ ${command}${isTestingV1() ? '' : ' mycorp'} --json
   `
 }
 
@@ -60,18 +72,24 @@ async function run(
     parentName
   })
 
-  const json = Boolean(cli.flags['json'])
-  const markdown = Boolean(cli.flags['markdown'])
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
diff --git a/src/commands/organization/cmd-organization-policy-security.test.ts b/src/commands/organization/cmd-organization-policy-security.test.ts
index 09cbf1ba..8c5e7deb 100644
--- a/src/commands/organization/cmd-organization-policy-security.test.ts
+++ b/src/commands/organization/cmd-organization-policy-security.test.ts
@@ -29,8 +29,10 @@ describe('socket organization policy security', async () => {
 
           Options
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
 
           Your API token will need the \`security-policy:read\` permission otherwise
           the request will fail with an authentication error.
@@ -104,4 +106,93 @@ describe('socket organization policy security', async () => {
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
     }
   )
+
+  cmdit(
+    [
+      'organization',
+      'policy',
+      'security',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should report missing org name in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`""`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m
+        Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
+
+          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)"
+      `)
+
+      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+    }
+  )
+
+  cmdit(
+    [
+      'organization',
+      'policy',
+      'security',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}'
+    ],
+    'should accept default org in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'organization',
+      'policy',
+      'security',
+      '--org',
+      'forcedorg',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept --org flag in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
 })
diff --git a/src/commands/organization/cmd-organization-policy-security.ts b/src/commands/organization/cmd-organization-policy-security.ts
index 4bdf39e7..b062fb1f 100644
--- a/src/commands/organization/cmd-organization-policy-security.ts
+++ b/src/commands/organization/cmd-organization-policy-security.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleSecurityPolicy } from './handle-security-policy'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -20,11 +21,22 @@ const config: CliCommandConfig = {
   hidden: true,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, _config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -37,8 +49,8 @@ const config: CliCommandConfig = {
     the request will fail with an authentication error.
 
     Examples
-      $ ${command} mycorp
-      $ ${command} mycorp --json
+      $ ${command}${isTestingV1() ? '' : ' mycorp'}
+      $ ${command}${isTestingV1() ? '' : ' mycorp'} --json
   `
 }
 
@@ -60,11 +72,15 @@ async function run(
     parentName
   })
 
-  const json = Boolean(cli.flags['json'])
-  const markdown = Boolean(cli.flags['markdown'])
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
diff --git a/src/commands/repos/cmd-repos-create.ts b/src/commands/repos/cmd-repos-create.ts
index d4955d05..b85bfc4b 100644
--- a/src/commands/repos/cmd-repos-create.ts
+++ b/src/commands/repos/cmd-repos-create.ts
@@ -3,12 +3,12 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleCreateRepo } from './handle-create-repo'
 import constants from '../../constants'
 import { commonFlags } from '../../flags'
-import { getConfigValue, isTestingV1 } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
-import { suggestOrgSlug } from '../scan/suggest-org-slug'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -96,34 +96,20 @@ async function run(
     parentName
   })
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-
-  const interactive = cli.flags['interactive']
-  const dryRun = cli.flags['dryRun']
-
-  let orgSlug = String(cli.flags['org'] || defaultOrgSlug || '')
-  if (!orgSlug) {
-    if (isTestingV1()) {
-      // ask from server
-      logger.error(
-        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
-      )
-      logger.error(
-        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
-      )
-      if (dryRun) {
-        logger.fail('Skipping auto-discovery of org in dry-run mode')
-      } else if (!interactive) {
-        logger.fail('Skipping auto-discovery of org when interactive = false')
-      } else {
-        orgSlug = (await suggestOrgSlug()) || ''
-      }
-    } else {
-      orgSlug = cli.input[0] || ''
-    }
-  }
+  const {
+    dryRun,
+    interactive,
+    org: orgFlag,
+    repoName: repoNameFlag
+  } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
-  const repoNameFlag = cli.flags['repoName']
   const repoName = (isTestingV1() ? cli.input[0] : repoNameFlag) || ''
 
   const apiToken = getDefaultToken()
diff --git a/src/commands/repos/cmd-repos-del.ts b/src/commands/repos/cmd-repos-del.ts
index 9825da46..93ddb5d8 100644
--- a/src/commands/repos/cmd-repos-del.ts
+++ b/src/commands/repos/cmd-repos-del.ts
@@ -3,12 +3,12 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleDeleteRepo } from './handle-delete-repo'
 import constants from '../../constants'
 import { commonFlags } from '../../flags'
-import { getConfigValue, isTestingV1 } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
-import { suggestOrgSlug } from '../scan/suggest-org-slug'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -66,35 +66,18 @@ async function run(
     parentName
   })
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-
-  const interactive = cli.flags['interactive']
-  const dryRun = cli.flags['dryRun']
-
-  let orgSlug = String(cli.flags['org'] || defaultOrgSlug || '')
-  if (!orgSlug) {
-    if (isTestingV1()) {
-      // ask from server
-      logger.error(
-        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
-      )
-      logger.error(
-        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
-      )
-      if (dryRun) {
-        logger.fail('Skipping auto-discovery of org in dry-run mode')
-      } else if (!interactive) {
-        logger.fail('Skipping auto-discovery of org when interactive = false')
-      } else {
-        orgSlug = (await suggestOrgSlug()) || ''
-      }
-    } else {
-      orgSlug = cli.input[0] || ''
-    }
-  }
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
   const repoName =
     (defaultOrgSlug || isTestingV1() ? cli.input[0] : cli.input[1]) || ''
+
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
diff --git a/src/commands/repos/cmd-repos-list.ts b/src/commands/repos/cmd-repos-list.ts
index e5c88415..9ae43058 100644
--- a/src/commands/repos/cmd-repos-list.ts
+++ b/src/commands/repos/cmd-repos-list.ts
@@ -3,12 +3,12 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleListRepos } from './handle-list-repos'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue, isTestingV1 } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
-import { suggestOrgSlug } from '../scan/suggest-org-slug'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -92,32 +92,14 @@ async function run(
 
   const { json, markdown } = cli.flags
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-
-  const interactive = cli.flags['interactive']
-  const dryRun = cli.flags['dryRun']
-
-  let orgSlug = String(cli.flags['org'] || defaultOrgSlug || '')
-  if (!orgSlug) {
-    if (isTestingV1()) {
-      // ask from server
-      logger.error(
-        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
-      )
-      logger.error(
-        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
-      )
-      if (dryRun) {
-        logger.fail('Skipping auto-discovery of org in dry-run mode')
-      } else if (!interactive) {
-        logger.fail('Skipping auto-discovery of org when interactive = false')
-      } else {
-        orgSlug = (await suggestOrgSlug()) || ''
-      }
-    } else {
-      orgSlug = cli.input[0] || ''
-    }
-  }
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
   const apiToken = getDefaultToken()
 
diff --git a/src/commands/repos/cmd-repos-update.ts b/src/commands/repos/cmd-repos-update.ts
index 6ef6bb36..9a3f95e8 100644
--- a/src/commands/repos/cmd-repos-update.ts
+++ b/src/commands/repos/cmd-repos-update.ts
@@ -3,12 +3,12 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleUpdateRepo } from './handle-update-repo'
 import constants from '../../constants'
 import { commonFlags } from '../../flags'
-import { getConfigValue, isTestingV1 } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
-import { suggestOrgSlug } from '../scan/suggest-org-slug'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -96,32 +96,14 @@ async function run(
     parentName
   })
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-
-  const interactive = cli.flags['interactive']
-  const dryRun = cli.flags['dryRun']
-
-  let orgSlug = String(cli.flags['org'] || defaultOrgSlug || '')
-  if (!orgSlug) {
-    if (isTestingV1()) {
-      // ask from server
-      logger.error(
-        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
-      )
-      logger.error(
-        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
-      )
-      if (dryRun) {
-        logger.fail('Skipping auto-discovery of org in dry-run mode')
-      } else if (!interactive) {
-        logger.fail('Skipping auto-discovery of org when interactive = false')
-      } else {
-        orgSlug = (await suggestOrgSlug()) || ''
-      }
-    } else {
-      orgSlug = cli.input[0] || ''
-    }
-  }
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
   const repoNameFlag = cli.flags['repoName']
   const repoName = (isTestingV1() ? cli.input[0] : repoNameFlag) || ''
diff --git a/src/commands/repos/cmd-repos-view.ts b/src/commands/repos/cmd-repos-view.ts
index 77df4962..deea8571 100644
--- a/src/commands/repos/cmd-repos-view.ts
+++ b/src/commands/repos/cmd-repos-view.ts
@@ -3,12 +3,12 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleViewRepo } from './handle-view-repo'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue, isTestingV1 } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 import { getDefaultToken } from '../../utils/sdk'
-import { suggestOrgSlug } from '../scan/suggest-org-slug'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -72,36 +72,22 @@ async function run(
     parentName
   })
 
-  const { json, markdown } = cli.flags
-
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-
-  const interactive = cli.flags['interactive']
-  const dryRun = cli.flags['dryRun']
-
-  let orgSlug = String(cli.flags['org'] || defaultOrgSlug || '')
-  if (!orgSlug) {
-    if (isTestingV1()) {
-      // ask from server
-      logger.error(
-        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
-      )
-      logger.error(
-        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
-      )
-      if (dryRun) {
-        logger.fail('Skipping auto-discovery of org in dry-run mode')
-      } else if (!interactive) {
-        logger.fail('Skipping auto-discovery of org when interactive = false')
-      } else {
-        orgSlug = (await suggestOrgSlug()) || ''
-      }
-    } else {
-      orgSlug = cli.input[0] || ''
-    }
-  }
+  const {
+    dryRun,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag,
+    repoName: repoNameFlag
+  } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
-  const repoNameFlag = cli.flags['repoName']
   const repoName = (isTestingV1() ? cli.input[0] : repoNameFlag) || ''
 
   const apiToken = getDefaultToken()
diff --git a/src/commands/scan/cmd-scan-create.test.ts b/src/commands/scan/cmd-scan-create.test.ts
index fa08bc73..eb7f1833 100644
--- a/src/commands/scan/cmd-scan-create.test.ts
+++ b/src/commands/scan/cmd-scan-create.test.ts
@@ -60,6 +60,7 @@ describe('socket scan create', async () => {
             --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
             --pendingHead     Designate this full-scan as the latest scan of a given branch. This must be set to have it show up in the dashboard.
             --pullRequest     Commit hash
             --readOnly        Similar to --dry-run except it can read from remote, stops before it would create an actual report
@@ -68,6 +69,7 @@ describe('socket scan create', async () => {
             --tmp             Set the visibility (true/false) of the scan in your dashboard. Can not be used when --pendingHead is set.
 
           Examples
+            $ socket scan create FakeOrg .
             $ socket scan create --repo=test-repo --branch=main FakeOrg ./package.json"
       `)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/scan/cmd-scan-create.ts b/src/commands/scan/cmd-scan-create.ts
index 095b1361..d485c5c4 100644
--- a/src/commands/scan/cmd-scan-create.ts
+++ b/src/commands/scan/cmd-scan-create.ts
@@ -5,7 +5,8 @@ import { suggestOrgSlug } from './suggest-org-slug'
 import { suggestTarget } from './suggest_target'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -73,6 +74,11 @@ const config: CliCommandConfig = {
       shortFlag: 'pr',
       description: 'Commit hash'
     },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     readOnly: {
       type: 'boolean',
       default: false,
@@ -102,7 +108,7 @@ const config: CliCommandConfig = {
   // TODO: your project's "socket.yml" file's "projectIgnorePaths"
   help: (command, config) => `
     Usage
-      $ ${command} [...options] <org> <TARGET> [TARGET...]
+      $ ${command} [...options]${isTestingV1() ? '' : ' <org>'} <TARGET> [TARGET...]
 
     API Token Requirements
       - Quota: 1 unit
@@ -135,7 +141,8 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} --repo=test-repo --branch=main FakeOrg ./package.json
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} .
+      $ ${command} --repo=test-repo --branch=main${isTestingV1() ? '' : ' FakeOrg'} ./package.json
   `
 }
 
@@ -164,10 +171,11 @@ async function run(
     committers,
     cwd: cwdOverride,
     defaultBranch,
-    dryRun,
+    dryRun = false,
     interactive = true,
     json,
     markdown,
+    org: orgFlag,
     pendingHead,
     pullRequest,
     readOnly,
@@ -185,6 +193,7 @@ async function run(
     interactive: boolean
     json: boolean
     markdown: boolean
+    org: string
     pendingHead: boolean
     pullRequest: number
     readOnly: boolean
@@ -192,9 +201,19 @@ async function run(
     report: boolean
     tmp: boolean
   }
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  let orgSlug = defaultOrgSlug || cli.input[0] || ''
-  let targets = cli.input.slice(defaultOrgSlug ? 0 : 1)
+
+  let [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    interactive,
+    dryRun
+  )
+  if (!defaultOrgSlug) {
+    // Tmp. just for TS. will drop this later.
+    defaultOrgSlug = ''
+  }
+
+  let targets = cli.input.slice(isTestingV1() || defaultOrgSlug ? 0 : 1)
 
   const cwd =
     cwdOverride && cwdOverride !== 'process.cwd()'
@@ -242,9 +261,11 @@ async function run(
 
   const wasBadInput = handleBadInput(
     {
-      nook: !!defaultOrgSlug,
+      nook: !isTestingV1() && !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/scan/cmd-scan-del.test.ts b/src/commands/scan/cmd-scan-del.test.ts
index 637bd1c8..1fe57485 100644
--- a/src/commands/scan/cmd-scan-del.test.ts
+++ b/src/commands/scan/cmd-scan-del.test.ts
@@ -29,8 +29,10 @@ describe('socket scan del', async () => {
 
           Options
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
 
           Examples
             $ socket scan del FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0"
@@ -66,7 +68,7 @@ describe('socket scan del', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - Scan ID to delete (\\x1b[31mmissing\\x1b[39m)
 
diff --git a/src/commands/scan/cmd-scan-del.ts b/src/commands/scan/cmd-scan-del.ts
index 0627af2c..0b741c05 100644
--- a/src/commands/scan/cmd-scan-del.ts
+++ b/src/commands/scan/cmd-scan-del.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleDeleteScan } from './handle-delete-scan'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -19,11 +20,22 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID>
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID>
 
     API Token Requirements
       - Quota: 1 unit
@@ -33,7 +45,7 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0
   `
 }
 
@@ -55,16 +67,26 @@ async function run(
     parentName
   })
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+
+  const scanId =
+    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/scan/cmd-scan-diff.test.ts b/src/commands/scan/cmd-scan-diff.test.ts
index 16bc28e3..b72e2d8f 100644
--- a/src/commands/scan/cmd-scan-diff.test.ts
+++ b/src/commands/scan/cmd-scan-diff.test.ts
@@ -38,12 +38,14 @@ describe('socket scan diff', async () => {
             --depth           Max depth of JSON to display before truncating, use zero for no limit (without --json/--file)
             --file            Path to a local file where the output should be saved. Use \`-\` to force stdout.
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
 
           Examples
-            $ socket scan diff FakeCorp aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
-            $ socket scan diff FakeCorp aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json"
+            $ socket scan diff FakeOrg aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
+            $ socket scan diff FakeOrg aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json"
       `
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -79,7 +81,7 @@ describe('socket scan diff', async () => {
           - Specify two Scan IDs. (\\x1b[31mmissing both Scan IDs\\x1b[39m)
             A Scan ID looks like \`aaa0aa0a-aaaa-0000-0a0a-0000000a00a0\`.
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)"
       `)
diff --git a/src/commands/scan/cmd-scan-diff.ts b/src/commands/scan/cmd-scan-diff.ts
index 69aec65d..b1623045 100644
--- a/src/commands/scan/cmd-scan-diff.ts
+++ b/src/commands/scan/cmd-scan-diff.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleDiffScan } from './handle-diff-scan'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -35,11 +36,22 @@ const config: CliCommandConfig = {
       default: '',
       description:
         'Path to a local file where the output should be saved. Use `-` to force stdout.'
+    },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
     }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <ID1> <ID2>
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <ID1> <ID2>
 
     API Token Requirements
       - Quota: 1 unit
@@ -56,8 +68,8 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeCorp aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
-      $ ${command} FakeCorp aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json
   `
 }
 
@@ -79,10 +91,22 @@ async function run(
     parentName
   })
 
-  const { depth, file, json, markdown } = cli.flags
-
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const {
+    depth,
+    dryRun,
+    file,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag
+  } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
 
   let id1 = cli.input[defaultOrgSlug ? 0 : 1] || ''
   let id2 = cli.input[defaultOrgSlug ? 1 : 2] || ''
@@ -111,7 +135,9 @@ async function run(
     {
       test: !!orgSlug,
       nook: true,
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
diff --git a/src/commands/scan/cmd-scan-list.test.ts b/src/commands/scan/cmd-scan-list.test.ts
index 28ec97b1..4b202d57 100644
--- a/src/commands/scan/cmd-scan-list.test.ts
+++ b/src/commands/scan/cmd-scan-list.test.ts
@@ -32,8 +32,10 @@ describe('socket scan list', async () => {
             --direction       Direction option (\`desc\` or \`asc\`) - Default is \`desc\`
             --fromTime        From time - as a unix timestamp
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
             --page            Page number - Default is 1
             --perPage         Results per page - Default is 30
             --repo            Filter to show only scans with this repository name
@@ -74,7 +76,7 @@ describe('socket scan list', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)"
       `)
diff --git a/src/commands/scan/cmd-scan-list.ts b/src/commands/scan/cmd-scan-list.ts
index 30c006eb..fc6ca13a 100644
--- a/src/commands/scan/cmd-scan-list.ts
+++ b/src/commands/scan/cmd-scan-list.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleListScans } from './handle-list-scans'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -39,6 +40,12 @@ const config: CliCommandConfig = {
       default: '',
       description: 'From time - as a unix timestamp'
     },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
     page: {
       type: 'number',
       shortFlag: 'p',
@@ -51,6 +58,11 @@ const config: CliCommandConfig = {
       default: 30,
       description: 'Results per page - Default is 30'
     },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     repo: {
       type: 'string',
       description: 'Filter to show only scans with this repository name'
@@ -71,7 +83,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -81,7 +93,7 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'}
   `
 }
 
@@ -103,16 +115,32 @@ async function run(
     parentName
   })
 
-  const { branch, json, markdown, repo } = cli.flags
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const {
+    branch,
+    dryRun,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag,
+    repo
+  } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/scan/cmd-scan-metadata.test.ts b/src/commands/scan/cmd-scan-metadata.test.ts
index 9585dd3f..38fba849 100644
--- a/src/commands/scan/cmd-scan-metadata.test.ts
+++ b/src/commands/scan/cmd-scan-metadata.test.ts
@@ -29,8 +29,10 @@ describe('socket scan metadata', async () => {
 
           Options
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
 
           Examples
             $ socket scan metadata FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0"
@@ -66,7 +68,7 @@ describe('socket scan metadata', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - Scan ID to inspect as argument (\\x1b[31mmissing\\x1b[39m)
 
diff --git a/src/commands/scan/cmd-scan-metadata.ts b/src/commands/scan/cmd-scan-metadata.ts
index f77172be..cd4db056 100644
--- a/src/commands/scan/cmd-scan-metadata.ts
+++ b/src/commands/scan/cmd-scan-metadata.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleOrgScanMetadata } from './handle-scan-metadata'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -22,11 +23,22 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID>
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID>
 
     API Token Requirements
       - Quota: 1 unit
@@ -36,7 +48,7 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0
   `
 }
 
@@ -58,17 +70,26 @@ async function run(
     parentName
   })
 
-  const { json, markdown } = cli.flags
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+
+  const scanId =
+    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/scan/cmd-scan-report.test.ts b/src/commands/scan/cmd-scan-report.test.ts
index b261f137..f27bb180 100644
--- a/src/commands/scan/cmd-scan-report.test.ts
+++ b/src/commands/scan/cmd-scan-report.test.ts
@@ -30,9 +30,11 @@ describe('socket scan report', async () => {
           Options
             --fold            Fold reported alerts to some degree
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --license         Also report the license policy status. Default: false
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
             --reportLevel     Which policy level alerts should be reported
             --short           Report only the healthy status
 
@@ -80,7 +82,7 @@ describe('socket scan report', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - Scan ID to fetch (\\x1b[31mmissing\\x1b[39m)
 
diff --git a/src/commands/scan/cmd-scan-report.ts b/src/commands/scan/cmd-scan-report.ts
index 6a2bf076..eb802104 100644
--- a/src/commands/scan/cmd-scan-report.ts
+++ b/src/commands/scan/cmd-scan-report.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleScanReport } from './handle-scan-report'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -29,6 +30,17 @@ const config: CliCommandConfig = {
       default: 'none',
       description: 'Fold reported alerts to some degree'
     },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     reportLevel: {
       type: 'string',
       default: 'warn',
@@ -47,7 +59,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID> [path to output file]
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID> [path to output file]
 
     API Token Requirements
       - Quota: 2 units
@@ -66,8 +78,8 @@ const config: CliCommandConfig = {
     Short responses: JSON: \`{healthy:bool}\`, markdown: \`healthy = bool\`, text: \`OK/ERR\`
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short
   `
 }
 
@@ -97,17 +109,28 @@ async function run(
     reportLevel = 'warn'
   } = cli.flags
 
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
-  const file = (defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+
+  const scanId =
+    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const file =
+    (isTestingV1() || defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/scan/cmd-scan-view.test.ts b/src/commands/scan/cmd-scan-view.test.ts
index 526fbdde..a518ebb7 100644
--- a/src/commands/scan/cmd-scan-view.test.ts
+++ b/src/commands/scan/cmd-scan-view.test.ts
@@ -31,8 +31,10 @@ describe('socket scan view', async () => {
 
           Options
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
 
           Examples
             $ socket scan view FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt"
@@ -68,7 +70,7 @@ describe('socket scan view', async () => {
 
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
 
           - Scan ID to delete (\\x1b[31mmissing\\x1b[39m)
 
diff --git a/src/commands/scan/cmd-scan-view.ts b/src/commands/scan/cmd-scan-view.ts
index b543f087..985f1d0e 100644
--- a/src/commands/scan/cmd-scan-view.ts
+++ b/src/commands/scan/cmd-scan-view.ts
@@ -4,7 +4,8 @@ import { handleScanView } from './handle-scan-view'
 import { streamScan } from './streamScan'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -23,11 +24,22 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID> [path to output file]
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID> [path to output file]
 
     API Token Requirements
       - Quota: 1 unit
@@ -39,7 +51,7 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt
   `
 }
 
@@ -61,18 +73,28 @@ async function run(
     parentName
   })
 
-  const { json, markdown } = cli.flags
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
-  const file = (defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+
+  const scanId =
+    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const file =
+    (isTestingV1() || defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/threat-feed/cmd-threat-feed.test.ts b/src/commands/threat-feed/cmd-threat-feed.test.ts
index fc145f1f..fa20d51a 100644
--- a/src/commands/threat-feed/cmd-threat-feed.test.ts
+++ b/src/commands/threat-feed/cmd-threat-feed.test.ts
@@ -21,7 +21,7 @@ describe('socket threat-feed', async () => {
         "[beta] View the threat feed
 
           Usage
-            $ socket threat-feed
+            $ socket threat-feed <org slug>
 
           API Token Requirements
             - Quota: 1 unit
@@ -36,8 +36,10 @@ describe('socket threat-feed', async () => {
             --eco             Only show threats for a particular ecosystem
             --filter          Filter what type of threats to return
             --help            Print this help
+            --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
+            --org             Force override the organization slug, overrides the default org from config
             --page            Page token
             --perPage         Number of items per page
 
@@ -65,8 +67,8 @@ describe('socket threat-feed', async () => {
             - pypi
 
           Examples
-            $ socket threat-feed
-            $ socket threat-feed --perPage=5 --page=2 --direction=asc --filter=joke"
+            $ socket threat-feed FakeOrg
+            $ socket threat-feed FakeOrg --perPage=5 --page=2 --direction=asc --filter=joke"
       `
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -125,4 +127,87 @@ describe('socket threat-feed', async () => {
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
     }
   )
+
+  cmdit(
+    [
+      'threat-feed',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should report missing org name in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`""`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m
+        Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
+
+          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)"
+      `)
+
+      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+    }
+  )
+
+  cmdit(
+    [
+      'threat-feed',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}'
+    ],
+    'should accept default org in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
+
+  cmdit(
+    [
+      'threat-feed',
+      '--org',
+      'forcedorg',
+      '--dry-run',
+      '--config',
+      '{"isTestingV1": true, "apiToken":"anything"}'
+    ],
+    'should accept --org flag in v1',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
+        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
+        \\x1b[39m"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    }
+  )
 })
diff --git a/src/commands/threat-feed/cmd-threat-feed.ts b/src/commands/threat-feed/cmd-threat-feed.ts
index 44ffcfc2..654d5bac 100644
--- a/src/commands/threat-feed/cmd-threat-feed.ts
+++ b/src/commands/threat-feed/cmd-threat-feed.ts
@@ -3,7 +3,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { handleThreatFeed } from './handle-threat-feed'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { getConfigValue } from '../../utils/config'
+import { isTestingV1 } from '../../utils/config'
+import { determineOrgSlug } from '../../utils/determine-org-slug'
 import { handleBadInput } from '../../utils/handle-bad-input'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
@@ -20,6 +21,17 @@ const config: CliCommandConfig = {
   flags: {
     ...commonFlags,
     ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     perPage: {
       type: 'number',
       shortFlag: 'pp',
@@ -53,7 +65,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}
+      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -90,8 +102,8 @@ const config: CliCommandConfig = {
       - pypi
 
     Examples
-      $ ${command}
-      $ ${command} --perPage=5 --page=2 --direction=asc --filter=joke
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'}
+      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} --perPage=5 --page=2 --direction=asc --filter=joke
   `
 }
 
@@ -113,9 +125,15 @@ async function run(
     parentName
   })
 
-  const { json, markdown } = cli.flags
-  const defaultOrgSlug = getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+
   const apiToken = getDefaultToken()
 
   const wasBadInput = handleBadInput(
diff --git a/src/utils/determine-org-slug.ts b/src/utils/determine-org-slug.ts
new file mode 100644
index 00000000..cce0fb06
--- /dev/null
+++ b/src/utils/determine-org-slug.ts
@@ -0,0 +1,36 @@
+import { logger } from '@socketsecurity/registry/lib/logger'
+
+import { getConfigValue, isTestingV1 } from './config'
+import { suggestOrgSlug } from '../commands/scan/suggest-org-slug'
+
+export async function determineOrgSlug(
+  orgFlag: string,
+  firstArg: string,
+  interactive: boolean,
+  dryRun: boolean
+): Promise<[string, string]> {
+  const defaultOrgSlug = getConfigValue('defaultOrg') || ''
+  let orgSlug = String(orgFlag || defaultOrgSlug || '')
+  if (!orgSlug) {
+    if (isTestingV1()) {
+      // ask from server
+      logger.error(
+        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
+      )
+      logger.error(
+        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
+      )
+      if (dryRun) {
+        logger.fail('Skipping auto-discovery of org in dry-run mode')
+      } else if (!interactive) {
+        logger.fail('Skipping auto-discovery of org when interactive = false')
+      } else {
+        orgSlug = (await suggestOrgSlug()) || ''
+      }
+    } else {
+      orgSlug = firstArg || ''
+    }
+  }
+
+  return [orgSlug, defaultOrgSlug]
+}