diff --git a/charts/defguard-gateway/Chart.yaml b/charts/defguard-gateway/Chart.yaml
index 7491212..101db7c 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.2
-appVersion: 2.0.0-beta2
+version: 2.0.0
+appVersion: 2.0.0
diff --git a/charts/defguard-proxy/Chart.yaml b/charts/defguard-proxy/Chart.yaml
index 57660d0..de51631 100644
--- a/charts/defguard-proxy/Chart.yaml
+++ b/charts/defguard-proxy/Chart.yaml
@@ -4,5 +4,5 @@ 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.2
-appVersion: 2.0.0-beta2
+version: 2.0.0
+appVersion: 2.0.0
diff --git a/docker-compose2.0/docker-compose.firewall.yaml b/docker-compose2.0/docker-compose.firewall.yaml
index 2538283..55ce71d 100644
--- a/docker-compose2.0/docker-compose.firewall.yaml
+++ b/docker-compose2.0/docker-compose.firewall.yaml
@@ -1,6 +1,6 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:2.0.0-beta2
+    image: ghcr.io/defguard/defguard:2.0.0
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
       DEFGUARD_DB_HOST: db
@@ -21,7 +21,7 @@ services:
       - default
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0
     volumes:
       - ./.volumes/certs2.0/edge1:/etc/defguard/certs
     ports:
diff --git a/docker-compose2.0/docker-compose.ha.yaml b/docker-compose2.0/docker-compose.ha.yaml
index 5d4eca2..b89fa73 100644
--- a/docker-compose2.0/docker-compose.ha.yaml
+++ b/docker-compose2.0/docker-compose.ha.yaml
@@ -1,6 +1,6 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:2.0.0-beta2
+    image: ghcr.io/defguard/defguard:2.0.0
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
       DEFGUARD_DB_HOST: db
@@ -18,12 +18,12 @@ services:
       - "8000:8000"
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0
     volumes:
       - ./.volumes/certs2.0-ha/edge1:/etc/defguard/certs
 
   edge2:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0
     volumes:
       - ./.volumes/certs2.0-ha/edge2:/etc/defguard/certs
 
@@ -38,7 +38,7 @@ services:
       - ./nginx/edge.conf:/etc/nginx/conf.d/default.conf:ro
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0-beta2
+    image: ghcr.io/defguard/gateway:2.0.0
     cap_add:
       - NET_ADMIN
     volumes:
@@ -48,7 +48,7 @@ services:
       HEALTH_PORT: 55003
 
   gateway2:
-    image: ghcr.io/defguard/gateway:2.0.0-beta2
+    image: ghcr.io/defguard/gateway:2.0.0
     cap_add:
       - NET_ADMIN
     volumes:
diff --git a/docker-compose2.0/docker-compose.ldap.yaml b/docker-compose2.0/docker-compose.ldap.yaml
index 4fb96c2..dd06f10 100644
--- a/docker-compose2.0/docker-compose.ldap.yaml
+++ b/docker-compose2.0/docker-compose.ldap.yaml
@@ -1,6 +1,6 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:2.0.0-beta2
+    image: ghcr.io/defguard/defguard:2.0.0
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
       DEFGUARD_DB_HOST: db
@@ -18,7 +18,7 @@ services:
       - "8000:8000"
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0
     volumes:
       - ./.volumes/certs2.0/edge1:/etc/defguard/certs
     ports:
@@ -27,7 +27,7 @@ services:
       - "443:443"
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0-beta2
+    image: ghcr.io/defguard/gateway:2.0.0
     cap_add:
       - NET_ADMIN
     volumes:
diff --git a/docker-compose2.0/docker-compose.yaml b/docker-compose2.0/docker-compose.yaml
index db8c5d7..6ce68fb 100644
--- a/docker-compose2.0/docker-compose.yaml
+++ b/docker-compose2.0/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:2.0.0-beta2
+    image: ghcr.io/defguard/defguard:2.0.0
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
       DEFGUARD_DB_HOST: db
@@ -18,7 +18,7 @@ services:
       - "8000:8000"
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0
     volumes:
       - ./.volumes/certs2.0/edge1:/etc/defguard/certs
     ports:
@@ -27,7 +27,7 @@ services:
       - "443:443"
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0-beta2
+    image: ghcr.io/defguard/gateway:2.0.0
     cap_add:
       - NET_ADMIN
     volumes: