diff --git a/group_vars/all/03_domains.yml b/group_vars/all/03_domains.yml
index 5d4cca55..cfdbcd38 100644
--- a/group_vars/all/03_domains.yml
+++ b/group_vars/all/03_domains.yml
@@ -77,3 +77,7 @@ defaults_redirect_domain_mappings:
 - { source: "taiga.{{primary_domain}}",       target: "{{domains.taiga}}" }
 - { source: "videos.{{primary_domain}}",      target: "{{domains.peertube}}" }
 - { source: "wordpress.{{primary_domain}}",   target: "{{domains.wordpress[0]}}" }
+
+# Domains which are deprecated and should be cleaned up
+deprecated_domains: []
+
diff --git a/roles/docker-mailu/tasks/create-mailu-user-and-token.yml b/roles/docker-mailu/tasks/create-mailu-user-and-token.yml
index 8aadd7fa..9a6ad250 100644
--- a/roles/docker-mailu/tasks/create-mailu-user-and-token.yml
+++ b/roles/docker-mailu/tasks/create-mailu-user-and-token.yml
@@ -51,6 +51,7 @@
   when:
     - users[mailu_user].mailu_token is not defined
     - mailu_user_existing_token is not none
+    - mailu_user_existing_token.id is defined
   register: mailu_token_delete
   changed_when: mailu_token_delete.rc == 0
 
diff --git a/roles/nginx-domain-setup/meta/main.yml b/roles/nginx-domain-setup/meta/main.yml
index 1e261d42..faa29776 100644
--- a/roles/nginx-domain-setup/meta/main.yml
+++ b/roles/nginx-domain-setup/meta/main.yml
@@ -22,4 +22,6 @@ galaxy_info:
     - archlinux
   repository: https://s.veen.world/cymais
   issue_tracker_url: https://s.veen.world/cymaisissues
-  documentation: https://s.veen.world/cymais
\ No newline at end of file
+  documentation: https://s.veen.world/cymais
+dependencies:
+  - nginx
\ No newline at end of file
diff --git a/roles/nginx-https-get-cert/tasks/main.yml b/roles/nginx-https-get-cert/tasks/main.yml
index 789b5b95..4f63fae3 100644
--- a/roles/nginx-https-get-cert/tasks/main.yml
+++ b/roles/nginx-https-get-cert/tasks/main.yml
@@ -28,7 +28,7 @@
   command: >-
     certbot delete --cert-name {{ domain }} --non-interactive
   when: 
-    - mode_cleanup | bool  
+    - mode_cleanup | bool
       # Cleanup mode is enabled
     - enable_wildcard_certificate | bool  
       # Wildcard certificate is enabled
diff --git a/roles/nginx-https/meta/main.yml b/roles/nginx-https/meta/main.yml
index 3b1b4e7d..25815bc4 100644
--- a/roles/nginx-https/meta/main.yml
+++ b/roles/nginx-https/meta/main.yml
@@ -1,3 +1,4 @@
 dependencies:
 - nginx
+- nginx-domains-cleanup
 - letsencrypt
\ No newline at end of file
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index fcf05d8c..2c9b45d1 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -3,7 +3,7 @@
   pacman:
     name:
       - nginx
-      - nginx-mod-stream # Enable Stream support
+      - nginx-mod-stream
     state:  present
   notify: restart nginx
   when: run_once_nginx is not defined
diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2
index 17e6d14b..85144a61 100644
--- a/roles/nginx/templates/nginx.conf.j2
+++ b/roles/nginx/templates/nginx.conf.j2
@@ -1,4 +1,4 @@
-load_module /usr/lib/nginx/modules/ngx_stream_module.so; # Enable Stream support
+load_module /usr/lib/nginx/modules/ngx_stream_module.so;
 worker_processes auto;
 
 events