diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0cc15dc..ced50ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - main
+      - "release/**"
+    paths:
+      - ".github/workflows/release.yml"
+      - "charts/**"
 
 jobs:
   release:
@@ -27,7 +31,7 @@ jobs:
       - name: Add repositories
         run: |
           for dir in $(ls -d charts/*/); do
-            helm dependency list $dir 2> /dev/null | tail +2 | head -n -1 | awk '{ print "helm repo add " $1 " " $3 }' | while read cmd; do $cmd; done
+            helm dependency list $dir 2> /dev/null | tail +2 | head -n -1 | awk '{print "helm repo add " $1 " " $3}' | while read cmd; do $cmd; done
           done
 
       - name: Run chart-releaser
diff --git a/charts/defguard-gateway/Chart.yaml b/charts/defguard-gateway/Chart.yaml
index 10f2699..7491212 100644
--- a/charts/defguard-gateway/Chart.yaml
+++ b/charts/defguard-gateway/Chart.yaml
@@ -4,5 +4,5 @@ description: Defguard Gateway is a public-facing VPN endpoint.
 icon: https://defguard.net/favicon/favicon-512x512.png
 
 type: application
-version: 2.0.0-beta.1
-appVersion: 2.0.0-beta1
+version: 2.0.0-beta.2
+appVersion: 2.0.0-beta2
diff --git a/charts/defguard-proxy/Chart.yaml b/charts/defguard-proxy/Chart.yaml
index 42c29d7..57660d0 100644
--- a/charts/defguard-proxy/Chart.yaml
+++ b/charts/defguard-proxy/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: defguard-proxy
-description: Defguard Proxy is a public-facing proxy for Defguard Core.
+description: Defguard Edge is a public-facing proxy for Defguard Core.
 icon: https://defguard.net/favicon/favicon-512x512.png
 
 type: application
-version: 2.0.0-beta.1
-appVersion: 2.0.0-beta1
+version: 2.0.0-beta.2
+appVersion: 2.0.0-beta2
diff --git a/charts/defguard/Chart.lock b/charts/defguard/Chart.lock
index 9a092ed..c43e082 100644
--- a/charts/defguard/Chart.lock
+++ b/charts/defguard/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 18.5.16
+  version: 18.6.2
 - name: defguard-proxy
-  repository: https://defguard.github.io/deployment
-  version: 2.0.0-beta.1
+  repository: file://../defguard-proxy
+  version: 2.0.0-beta.2
 - name: defguard-gateway
-  repository: https://defguard.github.io/deployment
-  version: 2.0.0-beta.1
-digest: sha256:6fc08c440c27bb4c9e90d030cae0fbc9c5a244196dff959a447cbb7c8682177e
-generated: "2026-04-10T10:04:56.454317+02:00"
+  repository: file://../defguard-gateway
+  version: 2.0.0-beta.2
+digest: sha256:184510fdfbe621d790ac8b1033c5e6a9844f76a4da7c1839aaf376c57ca579c6
+generated: "2026-04-29T08:45:25.64435+02:00"
diff --git a/charts/defguard/Chart.yaml b/charts/defguard/Chart.yaml
index c07200e..8e825d5 100644
--- a/charts/defguard/Chart.yaml
+++ b/charts/defguard/Chart.yaml
@@ -4,21 +4,21 @@ description: Defguard is an open-source enterprise WireGuard VPN with MFA and SS
 icon: https://defguard.net/favicon/favicon-512x512.png
 
 type: application
-version: 2.0.0-beta.1
-appVersion: 2.0.0-beta1
+version: 2.0.0-beta.2
+appVersion: 2.0.0-beta2
 
 dependencies:
   - name: postgresql
     condition: postgresql.enabled
-    version: 18.5.16
+    version: 18.6.2
     repository: https://charts.bitnami.com/bitnami
   - name: defguard-proxy
     condition: defguard-proxy.enabled
-    version: 2.0.0-beta.1
+    version: 2.0.0-beta.2
     repository: https://defguard.github.io/deployment
     # repository: "file://../defguard-proxy"
   - name: defguard-gateway
     condition: defguard-gateway.enabled
-    version: 2.0.0-beta.1
+    version: 2.0.0-beta.2
     repository: https://defguard.github.io/deployment
     # repository: "file://../defguard-gateway"
diff --git a/charts/defguard/charts/defguard-gateway-2.0.0-beta.1.tgz b/charts/defguard/charts/defguard-gateway-2.0.0-beta.1.tgz
deleted file mode 100644
index 1fcd806..0000000
Binary files a/charts/defguard/charts/defguard-gateway-2.0.0-beta.1.tgz and /dev/null differ
diff --git a/charts/defguard/charts/defguard-gateway-2.0.0-beta.2.tgz b/charts/defguard/charts/defguard-gateway-2.0.0-beta.2.tgz
new file mode 100644
index 0000000..1746547
Binary files /dev/null and b/charts/defguard/charts/defguard-gateway-2.0.0-beta.2.tgz differ
diff --git a/charts/defguard/charts/defguard-proxy-2.0.0-beta.1.tgz b/charts/defguard/charts/defguard-proxy-2.0.0-beta.1.tgz
deleted file mode 100644
index f897e6f..0000000
Binary files a/charts/defguard/charts/defguard-proxy-2.0.0-beta.1.tgz and /dev/null differ
diff --git a/charts/defguard/charts/defguard-proxy-2.0.0-beta.2.tgz b/charts/defguard/charts/defguard-proxy-2.0.0-beta.2.tgz
new file mode 100644
index 0000000..c33be5c
Binary files /dev/null and b/charts/defguard/charts/defguard-proxy-2.0.0-beta.2.tgz differ
diff --git a/charts/defguard/charts/postgresql-18.5.16.tgz b/charts/defguard/charts/postgresql-18.5.16.tgz
deleted file mode 100644
index 8794edb..0000000
Binary files a/charts/defguard/charts/postgresql-18.5.16.tgz and /dev/null differ
diff --git a/charts/defguard/charts/postgresql-18.6.2.tgz b/charts/defguard/charts/postgresql-18.6.2.tgz
new file mode 100644
index 0000000..efc8fee
Binary files /dev/null and b/charts/defguard/charts/postgresql-18.6.2.tgz differ