diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b751f298b..fe61290ca2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.7.1 / 2025-10-16
+
+* [BUGFIX] OTLP: Prefix `key_` to label name when translating an OTel attribute name starting with a single underscore, and keep multiple consecutive underscores in label name when translating an OTel attribute name. This reverts the breaking changes introduced in 3.7.0. #17344
+
 ## 3.7.0 / 2025-10-15
 
 * [CHANGE] Remote-write: the following metrics are deprecated:
diff --git a/VERSION b/VERSION
index 7c69a55dbb..a76ccff2a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.0
+3.7.1
diff --git a/web/ui/mantine-ui/package.json b/web/ui/mantine-ui/package.json
index aed3bcd593..6144afa70d 100644
--- a/web/ui/mantine-ui/package.json
+++ b/web/ui/mantine-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@prometheus-io/mantine-ui",
   "private": true,
-  "version": "0.307.0",
+  "version": "0.307.1",
   "type": "module",
   "scripts": {
     "start": "vite",
@@ -28,7 +28,7 @@
     "@microsoft/fetch-event-source": "^2.0.1",
     "@nexucis/fuzzy": "^0.5.1",
     "@nexucis/kvsearch": "^0.9.1",
-    "@prometheus-io/codemirror-promql": "0.307.0",
+    "@prometheus-io/codemirror-promql": "0.307.1",
     "@reduxjs/toolkit": "^2.9.0",
     "@tabler/icons-react": "^3.35.0",
     "@tanstack/react-query": "^5.90.2",
diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json
index 78d8a36921..3c8f6fd58c 100644
--- a/web/ui/module/codemirror-promql/package.json
+++ b/web/ui/module/codemirror-promql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/codemirror-promql",
-  "version": "0.307.0",
+  "version": "0.307.1",
   "description": "a CodeMirror mode for the PromQL language",
   "types": "dist/esm/index.d.ts",
   "module": "dist/esm/index.js",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/prometheus/prometheus/blob/main/web/ui/module/codemirror-promql/README.md",
   "dependencies": {
-    "@prometheus-io/lezer-promql": "0.307.0",
+    "@prometheus-io/lezer-promql": "0.307.1",
     "lru-cache": "^11.2.2"
   },
   "devDependencies": {
diff --git a/web/ui/module/lezer-promql/package.json b/web/ui/module/lezer-promql/package.json
index 1837bc078b..951955cd53 100644
--- a/web/ui/module/lezer-promql/package.json
+++ b/web/ui/module/lezer-promql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/lezer-promql",
-  "version": "0.307.0",
+  "version": "0.307.1",
   "description": "lezer-based PromQL grammar",
   "main": "dist/index.cjs",
   "type": "module",
diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json
index 9c39ef7c7e..6eafc4f156 100644
--- a/web/ui/package-lock.json
+++ b/web/ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "prometheus-io",
-  "version": "0.307.0",
+  "version": "0.307.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "prometheus-io",
-      "version": "0.307.0",
+      "version": "0.307.1",
       "workspaces": [
         "mantine-ui",
         "module/*"
@@ -24,7 +24,7 @@
     },
     "mantine-ui": {
       "name": "@prometheus-io/mantine-ui",
-      "version": "0.307.0",
+      "version": "0.307.1",
       "dependencies": {
         "@codemirror/autocomplete": "^6.19.0",
         "@codemirror/language": "^6.11.3",
@@ -42,7 +42,7 @@
         "@microsoft/fetch-event-source": "^2.0.1",
         "@nexucis/fuzzy": "^0.5.1",
         "@nexucis/kvsearch": "^0.9.1",
-        "@prometheus-io/codemirror-promql": "0.307.0",
+        "@prometheus-io/codemirror-promql": "0.307.1",
         "@reduxjs/toolkit": "^2.9.0",
         "@tabler/icons-react": "^3.35.0",
         "@tanstack/react-query": "^5.90.2",
@@ -87,10 +87,10 @@
     },
     "module/codemirror-promql": {
       "name": "@prometheus-io/codemirror-promql",
-      "version": "0.307.0",
+      "version": "0.307.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@prometheus-io/lezer-promql": "0.307.0",
+        "@prometheus-io/lezer-promql": "0.307.1",
         "lru-cache": "^11.2.2"
       },
       "devDependencies": {
@@ -120,7 +120,7 @@
     },
     "module/lezer-promql": {
       "name": "@prometheus-io/lezer-promql",
-      "version": "0.307.0",
+      "version": "0.307.1",
       "license": "Apache-2.0",
       "devDependencies": {
         "@lezer/generator": "^1.8.0",
diff --git a/web/ui/package.json b/web/ui/package.json
index b4f70b17e5..be701b3577 100644
--- a/web/ui/package.json
+++ b/web/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "prometheus-io",
   "description": "Monorepo for the Prometheus UI",
-  "version": "0.307.0",
+  "version": "0.307.1",
   "private": true,
   "scripts": {
     "build": "bash build_ui.sh --all",