diff --git a/docker-compose2.0/docker-compose.firewall.yaml b/docker-compose2.0/docker-compose.firewall.yaml
index e8b212c..2538283 100644
--- a/docker-compose2.0/docker-compose.firewall.yaml
+++ b/docker-compose2.0/docker-compose.firewall.yaml
@@ -1,12 +1,8 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:dev
+    image: ghcr.io/defguard/defguard:2.0.0-beta2
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
-      DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
-      DEFGUARD_AUTH_SECRET: defguard-auth-secret
-      DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
-      DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
       DEFGUARD_DB_HOST: db
       DEFGUARD_DB_PORT: 5432
       DEFGUARD_DB_USER: defguard
@@ -25,7 +21,7 @@ services:
       - default
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
     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 306d04c..5d4eca2 100644
--- a/docker-compose2.0/docker-compose.ha.yaml
+++ b/docker-compose2.0/docker-compose.ha.yaml
@@ -1,12 +1,8 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard:2.0.0-beta2
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
-      DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
-      DEFGUARD_AUTH_SECRET: defguard-auth-secret
-      DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
-      DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
       DEFGUARD_DB_HOST: db
       DEFGUARD_DB_PORT: 5432
       DEFGUARD_DB_USER: defguard
@@ -22,12 +18,12 @@ services:
       - "8000:8000"
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
     volumes:
       - ./.volumes/certs2.0-ha/edge1:/etc/defguard/certs
 
   edge2:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
     volumes:
       - ./.volumes/certs2.0-ha/edge2:/etc/defguard/certs
 
@@ -42,7 +38,7 @@ services:
       - ./nginx/edge.conf:/etc/nginx/conf.d/default.conf:ro
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0-alpha2
+    image: ghcr.io/defguard/gateway:2.0.0-beta2
     cap_add:
       - NET_ADMIN
     volumes:
@@ -52,7 +48,7 @@ services:
       HEALTH_PORT: 55003
 
   gateway2:
-    image: ghcr.io/defguard/gateway:2.0.0-alpha2
+    image: ghcr.io/defguard/gateway:2.0.0-beta2
     cap_add:
       - NET_ADMIN
     volumes:
diff --git a/docker-compose2.0/docker-compose.ldap.yaml b/docker-compose2.0/docker-compose.ldap.yaml
index 176ddad..4fb96c2 100644
--- a/docker-compose2.0/docker-compose.ldap.yaml
+++ b/docker-compose2.0/docker-compose.ldap.yaml
@@ -1,12 +1,8 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:dev
+    image: ghcr.io/defguard/defguard:2.0.0-beta2
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
-      DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
-      DEFGUARD_AUTH_SECRET: defguard-auth-secret
-      DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
-      DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
       DEFGUARD_DB_HOST: db
       DEFGUARD_DB_PORT: 5432
       DEFGUARD_DB_USER: defguard
@@ -22,7 +18,7 @@ services:
       - "8000:8000"
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
     volumes:
       - ./.volumes/certs2.0/edge1:/etc/defguard/certs
     ports:
@@ -31,7 +27,7 @@ services:
       - "443:443"
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0-alpha2
+    image: ghcr.io/defguard/gateway:2.0.0-beta2
     cap_add:
       - NET_ADMIN
     volumes:
@@ -78,7 +74,8 @@ services:
     depends_on:
       - openldap
     environment:
-      PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'openldap': [{'server': [{'host': 'openldap', 'port': 1389}]}]}]"
+      PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'openldap': [{'server': [{'host':
+        'openldap', 'port': 1389}]}]}]"
       PHPLDAPADMIN_HTTPS: "false"
     ports:
       - "8081:80"
diff --git a/docker-compose2.0/docker-compose.yaml b/docker-compose2.0/docker-compose.yaml
index c274b85..db8c5d7 100644
--- a/docker-compose2.0/docker-compose.yaml
+++ b/docker-compose2.0/docker-compose.yaml
@@ -1,12 +1,8 @@
 services:
   core:
-    image: ghcr.io/defguard/defguard:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard:2.0.0-beta2
     environment:
       DEFGUARD_COOKIE_INSECURE: "true"
-      DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
-      DEFGUARD_AUTH_SECRET: defguard-auth-secret
-      DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
-      DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
       DEFGUARD_DB_HOST: db
       DEFGUARD_DB_PORT: 5432
       DEFGUARD_DB_USER: defguard
@@ -22,7 +18,7 @@ services:
       - "8000:8000"
 
   edge1:
-    image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
+    image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
     volumes:
       - ./.volumes/certs2.0/edge1:/etc/defguard/certs
     ports:
@@ -31,7 +27,7 @@ services:
       - "443:443"
 
   gateway1:
-    image: ghcr.io/defguard/gateway:2.0.0-alpha2
+    image: ghcr.io/defguard/gateway:2.0.0-beta2
     cap_add:
       - NET_ADMIN
     volumes:
diff --git a/docker-compose2.0/ldap/entrypoint/set_access.sh b/docker-compose2.0/ldap/entrypoint/set_access.sh
index 1930963..a94fa5b 100755
--- a/docker-compose2.0/ldap/entrypoint/set_access.sh
+++ b/docker-compose2.0/ldap/entrypoint/set_access.sh
@@ -18,5 +18,4 @@ olcAccess: to *
   by * read
 EOF
 
-
 ldap_stop