diff --git a/lerna.json b/lerna.json
index 3e7c3834156..086106ea51a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,5 +4,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "8.4.0-beta.1"
+  "version": "8.4.0"
 }
diff --git a/package.json b/package.json
index 1b4e3a3826b..929b488895f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "8.4.0-beta.1",
+  "version": "8.4.0",
   "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 55d9d01188c..353d05a5d75 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.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "5.0.2",
-    "@grafana/schema": "8.4.0-beta.1",
+    "@grafana/schema": "8.4.0",
     "@types/d3-interpolate": "^1.4.0",
     "d3-interpolate": "1.4.0",
     "date-fns": "2.28.0",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index f248469db50..54cfc595cc4 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.4.0-beta.1",
+  "version": "8.4.0",
   "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 06b887ec540..bd192c46bb0 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.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -48,7 +48,7 @@
     "@babel/core": "7.16.7",
     "@babel/preset-env": "7.16.7",
     "@cypress/webpack-preprocessor": "5.11.0",
-    "@grafana/e2e-selectors": "8.4.0-beta.1",
+    "@grafana/e2e-selectors": "8.4.0",
     "@grafana/tsconfig": "^1.0.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "8.2.3",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 836e2439ca6..2e1ca3c2fd2 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.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -22,9 +22,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@grafana/data": "8.4.0-beta.1",
-    "@grafana/e2e-selectors": "8.4.0-beta.1",
-    "@grafana/ui": "8.4.0-beta.1",
+    "@grafana/data": "8.4.0",
+    "@grafana/e2e-selectors": "8.4.0",
+    "@grafana/ui": "8.4.0",
     "@sentry/browser": "6.17.2",
     "history": "4.10.1",
     "lodash": "4.17.21",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index c8d2b7caea3..2e7b5c950c9 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "8.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index fc600afbdee..d62e1c19cbe 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.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
@@ -28,10 +28,10 @@
   "dependencies": {
     "@babel/core": "7.13.14",
     "@babel/preset-env": "7.13.12",
-    "@grafana/data": "8.4.0-beta.1",
+    "@grafana/data": "8.4.0",
     "@grafana/eslint-config": "2.5.2",
     "@grafana/tsconfig": "^1.0.0-rc1",
-    "@grafana/ui": "8.4.0-beta.1",
+    "@grafana/ui": "8.4.0",
     "@jest/core": "26.6.3",
     "@rushstack/eslint-patch": "1.0.6",
     "@types/command-exists": "^1.2.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index bc6dce050e6..77b18fb884a 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.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -33,9 +33,9 @@
     "@emotion/css": "11.7.1",
     "@emotion/react": "11.7.1",
     "@grafana/aws-sdk": "0.0.31",
-    "@grafana/data": "8.4.0-beta.1",
-    "@grafana/e2e-selectors": "8.4.0-beta.1",
-    "@grafana/schema": "8.4.0-beta.1",
+    "@grafana/data": "8.4.0",
+    "@grafana/e2e-selectors": "8.4.0",
+    "@grafana/schema": "8.4.0",
     "@grafana/slate-react": "0.22.10-grafana",
     "@monaco-editor/react": "4.3.1",
     "@popperjs/core": "2.11.2",
diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json
index 9326d12125e..671c28d74a3 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.4.0-beta.1",
+  "version": "8.4.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@emotion/css": "11.7.1",
-    "@grafana/data": "8.4.0-beta.1",
-    "@grafana/ui": "8.4.0-beta.1",
+    "@grafana/data": "8.4.0",
+    "@grafana/ui": "8.4.0",
     "chance": "^1.0.10",
     "classnames": "^2.2.5",
     "combokeys": "^3.0.0",
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 691c674e1e2..5070ef50023 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.4.0-beta.1",
+  "version": "8.4.0",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -24,9 +24,9 @@
     "webpack": "5.58.1"
   },
   "dependencies": {
-    "@grafana/data": "8.4.0-beta.1",
-    "@grafana/toolkit": "8.4.0-beta.1",
-    "@grafana/ui": "8.4.0-beta.1",
+    "@grafana/data": "8.4.0",
+    "@grafana/toolkit": "8.4.0",
+    "@grafana/ui": "8.4.0",
     "jquery": "3.5.1",
     "react": "17.0.1",
     "react-dom": "17.0.1",