diff --git a/roles/controller_notification_templates/tasks/main.yml b/roles/controller_notification_templates/tasks/main.yml
index 47f93be0e..59ef8919c 100644
--- a/roles/controller_notification_templates/tasks/main.yml
+++ b/roles/controller_notification_templates/tasks/main.yml
@@ -5,8 +5,8 @@
     new_name: "{{ __controller_notification_item.new_name | default(omit, true) }}"
     copy_from: "{{ __controller_notification_item.copy_from | default(omit, true) }}"
     description: "{{ __controller_notification_item.description | default(('' if controller_configuration_notifications_enforce_defaults else omit), true) }}"
-    organization: "{{ __controller_notification_item.organization.name | default(__controller_notification_item.organization) | mandatory }}"
-    notification_type: "{{ __controller_notification_item.notification_type | default(omit, true) | mandatory }}"
+    organization: "{{ __controller_notification_item.organization.name | default(__controller_notification_item.organization) | default(omit, true) }}"
+    notification_type: "{{ __controller_notification_item.notification_type | default(omit, true) }}"
     notification_configuration: "{{ __controller_notification_item.notification_configuration | default(({} if controller_configuration_notifications_enforce_defaults else omit), true) }}"
     messages: "{{ __controller_notification_item.messages | default(({} if controller_configuration_notifications_enforce_defaults else omit), true) | regex_replace('{  {', '{_~~remove~~_{') | regex_replace('_~~remove~~_', '') }}"
     state: "{{ __controller_notification_item.state | default(platform_state | default('present')) }}"