diff --git a/lerna.json b/lerna.json
index e9bc6581a3b..2c325e88342 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,5 +4,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "8.1.7"
+  "version": "8.1.8"
 }
diff --git a/package.json b/package.json
index 7ad3af9405c..78872deff79 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "repository": "github:grafana/grafana",
   "scripts": {
     "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index a418e7e6529..68fa7c97f7f 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 37e7b8d2816..b1ac92b449a 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index 738447b0391..3e26aa6c407 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -45,7 +45,7 @@
   "types": "src/index.ts",
   "dependencies": {
     "@cypress/webpack-preprocessor": "5.9.0",
-    "@grafana/e2e-selectors": "8.1.7",
+    "@grafana/e2e-selectors": "8.1.8",
     "@grafana/tsconfig": "^1.0.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "blink-diff": "1.0.13",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index a106f239216..2637a5347fa 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -22,9 +22,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@grafana/data": "8.1.7",
-    "@grafana/e2e-selectors": "8.1.7",
-    "@grafana/ui": "8.1.7",
+    "@grafana/data": "8.1.8",
+    "@grafana/e2e-selectors": "8.1.8",
+    "@grafana/ui": "8.1.8",
     "history": "4.10.1",
     "systemjs": "0.20.19",
     "systemjs-plugin-css": "0.1.37"
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 15613656448..6b785982ebb 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/toolkit",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
@@ -28,10 +28,10 @@
   "dependencies": {
     "@babel/core": "7.13.14",
     "@babel/preset-env": "7.13.12",
-    "@grafana/data": "8.1.7",
+    "@grafana/data": "8.1.8",
     "@grafana/eslint-config": "2.5.0",
     "@grafana/tsconfig": "^1.0.0-rc1",
-    "@grafana/ui": "8.1.7",
+    "@grafana/ui": "8.1.8",
     "@types/command-exists": "^1.2.0",
     "@types/expect-puppeteer": "3.3.1",
     "@types/fs-extra": "^8.1.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 0c294020f82..6c32ad5716a 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -29,8 +29,8 @@
     "@emotion/css": "11.1.3",
     "@emotion/react": "11.1.5",
     "@grafana/aws-sdk": "0.0.3",
-    "@grafana/data": "8.1.7",
-    "@grafana/e2e-selectors": "8.1.7",
+    "@grafana/data": "8.1.8",
+    "@grafana/e2e-selectors": "8.1.8",
     "@grafana/slate-react": "0.22.10-grafana",
     "@grafana/tsconfig": "^1.0.0-rc1",
     "@monaco-editor/react": "4.1.1",
diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json
index ef3893e479c..9a96925254e 100644
--- a/packages/jaeger-ui-components/package.json
+++ b/packages/jaeger-ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jaegertracing/jaeger-ui-components",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -16,8 +16,8 @@
   "dependencies": {
     "@emotion/css": "11.1.3",
     "@emotion/react": "11.1.5",
-    "@grafana/data": "8.1.7",
-    "@grafana/ui": "8.1.7",
+    "@grafana/data": "8.1.8",
+    "@grafana/ui": "8.1.8",
     "@types/classnames": "^2.2.7",
     "@types/deep-freeze": "^0.1.1",
     "@types/hoist-non-react-statics": "^3.3.1",
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 55f3c136781..9d869cc0626 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana-plugins/input-datasource",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -15,9 +15,9 @@
   },
   "author": "Grafana Labs",
   "devDependencies": {
-    "@grafana/data": "8.1.7",
-    "@grafana/toolkit": "8.1.7",
-    "@grafana/ui": "8.1.7"
+    "@grafana/data": "8.1.8",
+    "@grafana/toolkit": "8.1.8",
+    "@grafana/ui": "8.1.8"
   },
   "volta": {
     "extends": "../../../package.json"
diff --git a/yarn.lock b/yarn.lock
index d3706f16af4..c3395e55759 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4045,7 +4045,7 @@
     storybook-addon-outline "^1.4.1"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-knobs@6.3.5":
+"@storybook/addon-knobs@6.3.0":
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-6.3.0.tgz#f289c072729651150a27a163371df20922c24f93"
   integrity sha512-wsZZ1t38KHdaxzrc9oPyiIJDihJnjHRRabrENQbylktJwETEjb2z3eX0iBRJGiz/YCHO+tGd0ItyZArOdijT6g==