diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 100ad77f4bf..412a9ef9636 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -41,7 +41,6 @@
   "types": "src/index.ts",
   "dependencies": {
     "@grafana/tsconfig": "^1.0.0-rc1",
-    "commander": "5.0.0",
     "execa": "5.1.1",
     "tslib": "2.3.1",
     "typescript": "4.4.3",
diff --git a/packages/grafana-e2e/cli.js b/packages/grafana-e2e/cli.js
index 32f3a697346..88dedf61da9 100644
--- a/packages/grafana-e2e/cli.js
+++ b/packages/grafana-e2e/cli.js
@@ -1,5 +1,5 @@
 const execa = require('execa');
-const program = require('commander');
+const { program } = require('commander');
 const resolveBin = require('resolve-as-bin');
 const { resolve, sep } = require('path');
 
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index a3cf0cc8ba2..00744b30b4b 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -54,7 +54,7 @@
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "8.2.2",
     "blink-diff": "1.0.13",
-    "commander": "5.0.0",
+    "commander": "8.3.0",
     "cypress": "8.4.1",
     "cypress-file-upload": "5.0.8",
     "execa": "5.1.1",
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index e4b467692d3..0d731b00bd6 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -56,7 +56,7 @@
     "babel-plugin-angularjs-annotate": "0.10.0",
     "chalk": "^2.4.2",
     "command-exists": "^1.2.8",
-    "commander": "^5.0.0",
+    "commander": "^8.0.0",
     "concurrently": "6.3.0",
     "copy-webpack-plugin": "5.1.2",
     "css-loader": "3.4.2",
diff --git a/packages/grafana-toolkit/src/cli/index.ts b/packages/grafana-toolkit/src/cli/index.ts
index 5aa698874be..2ff2f2f01e4 100644
--- a/packages/grafana-toolkit/src/cli/index.ts
+++ b/packages/grafana-toolkit/src/cli/index.ts
@@ -1,6 +1,6 @@
 // @ts-ignore
 import chalk from 'chalk';
-import program from 'commander';
+import { program } from 'commander';
 import { promises as fs } from 'fs';
 import { execTask } from './utils/execTask';
 import { startTask } from './tasks/core.start';
@@ -280,10 +280,11 @@ export const run = (includeInternalScripts = false) => {
 
   program.parse(process.argv);
 
-  if (program.depreciate && program.depreciate.length === 2) {
+  const options = program.opts();
+  if (options.depreciate && options.depreciate.length === 2) {
     console.log(
       chalk.yellow.bold(
-        `[NPM script depreciation] ${program.depreciate[0]} is deprecated! Use ${program.depreciate[1]} instead!`
+        `[NPM script depreciation] ${options.depreciate[0]} is deprecated! Use ${options.depreciate[1]} instead!`
       )
     );
   }
diff --git a/yarn.lock b/yarn.lock
index a76cf1a3fdf..bf4b540b0e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2421,7 +2421,6 @@ __metadata:
     "@types/node": 14.17.27
     "@types/rollup-plugin-visualizer": 4.2.1
     "@types/systemjs": ^0.20.6
-    commander: 5.0.0
     execa: 5.1.1
     rimraf: 3.0.1
     rollup: 2.33.3
@@ -2454,7 +2453,7 @@ __metadata:
     "@types/uuid": 8.3.0
     babel-loader: 8.2.2
     blink-diff: 1.0.13
-    commander: 5.0.0
+    commander: 8.3.0
     cypress: 8.4.1
     cypress-file-upload: 5.0.8
     date-fns: 2.21.3
@@ -2618,7 +2617,7 @@ __metadata:
     babel-plugin-angularjs-annotate: 0.10.0
     chalk: ^2.4.2
     command-exists: ^1.2.8
-    commander: ^5.0.0
+    commander: ^8.0.0
     concurrently: 6.3.0
     copy-webpack-plugin: 5.1.2
     css-loader: 3.4.2
@@ -12503,10 +12502,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:5.0.0":
-  version: 5.0.0
-  resolution: "commander@npm:5.0.0"
-  checksum: 55cb7e3fa1ada53f9109f1475e981daeb6886c1bb67c6c2f0e492d37fd52e2c2359131d0d869114e20c66907c19faeac606ee1d00ff7b822b1a37219e07d6282
+"commander@npm:8.3.0, commander@npm:^8.0.0":
+  version: 8.3.0
+  resolution: "commander@npm:8.3.0"
+  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
   languageName: node
   linkType: hard
 
@@ -12517,7 +12516,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^5.0.0, commander@npm:^5.1.0":
+"commander@npm:^5.1.0":
   version: 5.1.0
   resolution: "commander@npm:5.1.0"
   checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447