diff --git a/charts/defguard/Chart.lock b/charts/defguard/Chart.lock
index 38781c3..f69fa1b 100644
--- a/charts/defguard/Chart.lock
+++ b/charts/defguard/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 2.0.0
 - name: defguard-gateway
   repository: https://defguard.github.io/deployment
-  version: 2.0.0
-digest: sha256:99959681524b647c6daccdcc7453fff4ea1ed923ac2a5380ca1f8c1dcd91c9c6
-generated: "2026-04-30T14:46:45.734169+02:00"
+  version: 2.0.1
+digest: sha256:0de72842e142f210004aa252a4693af2b3f84cb97af4fa0c0eb7f86abb4a95a7
+generated: "2026-05-05T12:52:33.156043+02:00"
diff --git a/charts/defguard/Chart.yaml b/charts/defguard/Chart.yaml
index 621a0a3..a5f1fd8 100644
--- a/charts/defguard/Chart.yaml
+++ b/charts/defguard/Chart.yaml
@@ -4,7 +4,7 @@ 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
+version: 2.0.1
 appVersion: 2.0.0
 
 dependencies:
@@ -19,6 +19,6 @@ dependencies:
     # repository: "file://../defguard-proxy"
   - name: defguard-gateway
     condition: defguard-gateway.enabled
-    version: 2.0.0
+    version: 2.0.1
     repository: https://defguard.github.io/deployment
     # repository: "file://../defguard-gateway"
diff --git a/charts/defguard/charts/defguard-gateway-2.0.0.tgz b/charts/defguard/charts/defguard-gateway-2.0.0.tgz
deleted file mode 100644
index c4900b2..0000000
Binary files a/charts/defguard/charts/defguard-gateway-2.0.0.tgz and /dev/null differ
diff --git a/charts/defguard/charts/defguard-gateway-2.0.1.tgz b/charts/defguard/charts/defguard-gateway-2.0.1.tgz
new file mode 100644
index 0000000..d7762c2
Binary files /dev/null and b/charts/defguard/charts/defguard-gateway-2.0.1.tgz differ
diff --git a/docker-compose2.0/docker-compose.firewall.yaml b/docker-compose2.0/docker-compose.firewall.yaml
index 55ce71d..2f4e196 100644
--- a/docker-compose2.0/docker-compose.firewall.yaml
+++ b/docker-compose2.0/docker-compose.firewall.yaml
@@ -32,7 +32,7 @@ services:
       - default
 
   gateway1:
-    image: ghcr.io/defguard/gateway:dev
+    image: ghcr.io/defguard/gateway:2.0.1
     cap_add:
       - NET_ADMIN
     volumes:
diff --git a/docker-compose2.0/docker-compose.ha.yaml b/docker-compose2.0/docker-compose.ha.yaml
index b89fa73..cd8b9bc 100644
--- a/docker-compose2.0/docker-compose.ha.yaml
+++ b/docker-compose2.0/docker-compose.ha.yaml
@@ -38,7 +38,7 @@ services:
       - ./nginx/edge.conf:/etc/nginx/conf.d/default.conf:ro
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0
+    image: ghcr.io/defguard/gateway:2.0.1
     cap_add:
       - NET_ADMIN
     volumes:
@@ -48,7 +48,7 @@ services:
       HEALTH_PORT: 55003
 
   gateway2:
-    image: ghcr.io/defguard/gateway:2.0.0
+    image: ghcr.io/defguard/gateway:2.0.1
     cap_add:
       - NET_ADMIN
     volumes:
@@ -58,7 +58,7 @@ services:
       HEALTH_PORT: 55003
 
   gateway-lb:
-    image: envoyproxy/envoy:v1.33-latest
+    image: envoyproxy/envoy:v1.38-latest
     command: ["envoy", "-c", "/etc/envoy/envoy.yaml", "-l", "debug"]
     ports:
       - "51820:51820/udp"
diff --git a/docker-compose2.0/docker-compose.ldap.yaml b/docker-compose2.0/docker-compose.ldap.yaml
index dd06f10..b15280f 100644
--- a/docker-compose2.0/docker-compose.ldap.yaml
+++ b/docker-compose2.0/docker-compose.ldap.yaml
@@ -27,7 +27,7 @@ services:
       - "443:443"
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0
+    image: ghcr.io/defguard/gateway:2.0.1
     cap_add:
       - NET_ADMIN
     volumes:
diff --git a/docker-compose2.0/docker-compose.yaml b/docker-compose2.0/docker-compose.yaml
index 6ce68fb..ae24c5d 100644
--- a/docker-compose2.0/docker-compose.yaml
+++ b/docker-compose2.0/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
       - "443:443"
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0
+    image: ghcr.io/defguard/gateway:2.0.1
     cap_add:
       - NET_ADMIN
     volumes: