diff --git a/tasks/check-role-conf.yml b/tasks/check-role-conf.yml
index b5a4a2e..48cc0f7 100644
--- a/tasks/check-role-conf.yml
+++ b/tasks/check-role-conf.yml
@@ -4,12 +4,6 @@
     odoo_role_odoo_server_wide_modules: "{{ odoo_role_odoo_server_wide_modules + ['dbfilter_from_header'] }}"
   when: odoo_role_enable_dbfilter_from_header | bool
   tags: ['server-wide']
-
-- name: Generate server wide modules configuration  (queue_job)
-  set_fact:
-    odoo_role_odoo_server_wide_modules: "{{ odoo_role_odoo_server_wide_modules + ['queue_job'] }}"
-  when: odoo_role_enable_queue_job | bool
-  tags: ['server-wide']
   
 - name: Check requirements for db_filter (odoo_role_channels)
   ansible.builtin.fail:
@@ -17,21 +11,14 @@
   when: odoo_role_enable_dbfilter_from_header | bool and odoo_role_channels is not defined
   tags: ['server-wide']
 
-- name: Extract databases from modules_dict
+- name: Generate server wide modules configuration  (queue_job)
   ansible.builtin.set_fact:
-     odoo_role_database_plugins: "{{ odoo_role_database_plugins | default([]) + [ item ] }}"     
-  with_items: "{{ odoo_role_odoo_community_modules_dict }}"
+    odoo_role_odoo_server_wide_modules: "{{ odoo_role_odoo_server_wide_modules + ['queue_job'] }}"
+  when: odoo_role_enable_queue_job | bool
   tags: ['server-wide']
 
 - name: Check if server_wide modules are declared  
-  ansible.builtin.set_fact:
-     odoo_role_all_plugins: "{{  odoo_role_all_plugins | default([]) + [ odoo_role_odoo_community_modules_dict[item] ] | flatten }}"
-  with_items: "{{ odoo_role_database_plugins }}"
-  tags: ['server-wide']
-
-- name: Require server_wide_modules to be declared
   ansible.builtin.fail:
-     msg: "Role Error: odoo_role_odoo_server_wide_modules are declared but not present on odoo_role_odoo_community_modules_dict"
+    msg: "Role Error: {{ item }} module is configured as a server wide module but it is not present in modules dict"
   with_items: "{{ odoo_role_odoo_server_wide_modules }}"
-  when: (item not in odoo_role_all_plugins) and (item != 'base' and item != 'web')
-  tags: ['server-wide']
+  when: (item not in odoo_role_odoo_community_modules_dict['shared']) and (item != 'web') and (item != 'base')