diff --git a/authentication.docker-compose.yml b/authentication.docker-compose.yml
index e02f951..3dbd494 100644
--- a/authentication.docker-compose.yml
+++ b/authentication.docker-compose.yml
@@ -8,6 +8,7 @@ services:
       NASCOMPOSE_TRAEFIK_DOMAINS: ${NASCOMPOSE_TRAEFIK_DOMAINS?}
       AUTHELIA_DEFAULT_REDIRECTION_URL: "" #Heimdall
       AUTHELIA_JWT_SECRET_FILE: /run/secrets/jwt_secret
+      AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: /run/secrets/storage_key
     networks:
       - traefik
     volumes:
@@ -46,3 +47,5 @@ configs:
 secrets:
   jwt_secret:
     file: ${NASCOMPOSE_SERVICES?}/secrets/authelia/jwt_secret
+  storage_key:
+    file: ${NASCOMPOSE_SERVICES?}/secrets/authelia/storage_key
diff --git a/docker/configs/authelia/access.yml b/docker/configs/authelia/access.yml
index b15e1dc..f7532fc 100644
--- a/docker/configs/authelia/access.yml
+++ b/docker/configs/authelia/access.yml
@@ -28,3 +28,6 @@
 ## Note: the order of the rules is important. The first policy matching (domain, resource, subject) applies.
 access_control:
   default_policy: two_factor
+
+session:
+  domain: {{ (env `NASCOMPOSE_TRAEFIK_DOMAINS` | split)._0 }}
diff --git a/docker/configs/authelia/configuration.yml b/docker/configs/authelia/configuration.yml
index 5c25b55..df76bd1 100644
--- a/docker/configs/authelia/configuration.yml
+++ b/docker/configs/authelia/configuration.yml
@@ -8,11 +8,6 @@ theme: auto
 ##
 ## The available providers are: `local`, `mysql`, `postgres`. You must use one and only one of these providers.
 storage:
-  ## The encryption key that is used to encrypt sensitive information in the database. Must be a string with a minimum
-  ## length of 20. Please see the docs if you configure this with an undesirable key and need to change it, you MUST use
-  ## the CLI to change this in the database if you want to change it from a previously configured value.
-  # encryption_key: you_must_generate_a_random_string_of_more_than_twenty_chars_and_configure_this
-
   ##
   ## Local (Storage Provider)
   ##