diff --git a/.github/workflows/release-hotfix.yml b/.github/workflows/release-hotfix.yml
new file mode 100644
index 0000000000..9d5eed836a
--- /dev/null
+++ b/.github/workflows/release-hotfix.yml
@@ -0,0 +1,22 @@
+on:
+  push:
+    branches:
+      - v[1-9]+.[0-9]+.[0-9]+-hotfix-[1-9]+ # match branches in format v6-20-10-hotfix-1
+      - hotfix-test-[1-9]+
+
+name: Release
+
+jobs:
+  release:
+    if: github.repository == 'ydb-platform/ydb-embedded-ui'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - uses: googleapis/release-please-action@v4
+        with:
+          token: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
+          target-branch: ${{ github.ref_name }}
+          config-file: release-please-config-hotfix.json
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f739d9d78..562e90ecdd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,6 +1,7 @@
 on:
   push:
-    branches: [main]
+    branches:
+      - main
 
 name: Release
 
@@ -15,7 +16,7 @@ jobs:
           node-version: 18
       - run: npm ci
       - run: npm test
-      - uses: GoogleCloudPlatform/release-please-action@v3
+      - uses: googleapis/release-please-action@v4
         with:
           token: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
           release-type: node
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
new file mode 100644
index 0000000000..b38ab73a33
--- /dev/null
+++ b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "6.31.1-hotfix"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cf8c6046d..cc9fba979e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [6.31.1-hotfix](https://github.com/ydb-platform/ydb-embedded-ui/compare/ydb-embedded-ui-v6.31.0...ydb-embedded-ui-v6.31.1-hotfix) (2024-11-07)
+
+
+### Bug Fixes
+
+* **Header:** fix developer ui link for embedded UI with proxy ([#1580](https://github.com/ydb-platform/ydb-embedded-ui/issues/1580)) ([b229301](https://github.com/ydb-platform/ydb-embedded-ui/commit/b229301e167c8651550606ee5450f6d7f2409048))
+* if popover has actions increase delayClosing ([#1573](https://github.com/ydb-platform/ydb-embedded-ui/issues/1573)) ([7680e96](https://github.com/ydb-platform/ydb-embedded-ui/commit/7680e96681a9edf6b29589b73189ac72ef48f3d4))
+* **NodeEndpointsTooltipContent:** change fields order ([#1585](https://github.com/ydb-platform/ydb-embedded-ui/issues/1585)) ([949a518](https://github.com/ydb-platform/ydb-embedded-ui/commit/949a518a272e920e36f4c2a94c3b502d37d6e3a4))
+* query templates modification ([#1579](https://github.com/ydb-platform/ydb-embedded-ui/issues/1579)) ([697921a](https://github.com/ydb-platform/ydb-embedded-ui/commit/697921abe30e0b3415c0cd08519b8fecdfaaa03b))
+* refresh schema and autoresresh icons should be similar ([#1572](https://github.com/ydb-platform/ydb-embedded-ui/issues/1572)) ([03bc63d](https://github.com/ydb-platform/ydb-embedded-ui/commit/03bc63dc5d386591a4ef2e73c7051349b37c83ed))
+* use both BSC and Whiteboard for disks ([#1564](https://github.com/ydb-platform/ydb-embedded-ui/issues/1564)) ([da6dfcd](https://github.com/ydb-platform/ydb-embedded-ui/commit/da6dfcd856468ff89b031a2d6bbf710c7033ef5a))
+
 ## [6.31.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.30.0...v6.31.0) (2024-11-02)
 
 
diff --git a/package-lock.json b/package-lock.json
index cdbabb3c93..62a0bcc8b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "6.31.0",
+  "version": "6.31.1-hotfix",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ydb-embedded-ui",
-      "version": "6.31.0",
+      "version": "6.31.1-hotfix",
       "dependencies": {
         "@bem-react/classname": "^1.6.0",
         "@gravity-ui/axios-wrapper": "^1.4.1",
diff --git a/package.json b/package.json
index 6269f9d176..156d853728 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "6.31.0",
+  "version": "6.31.1-hotfix",
   "files": [
     "dist"
   ],
diff --git a/release-please-config-hotfix.json b/release-please-config-hotfix.json
new file mode 100644
index 0000000000..605a502a04
--- /dev/null
+++ b/release-please-config-hotfix.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "bootstrap-sha": "a3a39782af968677866b86dc590d4150d4af4211",
+  "packages": {
+    ".": {
+      "release-type": "node",
+      "versioning": "prerelease",
+      "prerelease": true,
+      "prerelease-type": "hotfix",
+      "initial-version": ""
+    }
+  }
+}