diff --git a/roles/authelia/handlers/main.yml b/roles/authelia/handlers/main.yml
index e30beca..7acfa4d 100644
--- a/roles/authelia/handlers/main.yml
+++ b/roles/authelia/handlers/main.yml
@@ -4,5 +4,7 @@
   docker_container:
     name: "{{ authelia_container_name }}"
     state: started
-    restart: yes
+    restart: true
+    comparisons:
+      '*': ignore
   listen: restart-authelia
diff --git a/roles/authelia/vars/main.yml b/roles/authelia/vars/main.yml
index 459ce1c..b5791de 100644
--- a/roles/authelia/vars/main.yml
+++ b/roles/authelia/vars/main.yml
@@ -170,7 +170,12 @@ authelia_config_access_control:
   default_policy: "{{ authelia_config_access_control_default_policy }}"
   networks: "{{ authelia_config_access_control_networks }}"
   rules: "{{ authelia_config_access_control_rules }}"
-authelia_config_session:
+authelia_config_session: >-2
+  {{ authelia_config_session_base
+    | combine(({'redis': authelia_config_session_redis}
+      if authelia_config_session_redis_host else {}), recursive=true)
+  }}
+authelia_config_session_base:
   name: "{{ authelia_config_session_name }}"
   domain: "{{ authelia_config_session_domain }}"
   same_site: "{{ authelia_config_session_same_site }}"