diff --git a/src/features/channel/components/channel-add-edit-modal.tsx b/src/features/channel/components/channel-add-edit-modal.tsx
index 4f8e1164..90bb8ff1 100644
--- a/src/features/channel/components/channel-add-edit-modal.tsx
+++ b/src/features/channel/components/channel-add-edit-modal.tsx
@@ -43,7 +43,7 @@ export const ChannelAddEditModal = ({
                                     }: ChannelAddModalProps) => {
     const isMobile = useIsMobile();
     const [openInternal, setOpen] = useState(open);
-    const isLocalSystem = channel?.provider == "local";
+    const isLocalSystem = channel?.provider === "local";
 
     const isCreate = !Boolean(channel);
 
diff --git a/src/features/channel/components/channel-edit-button.tsx b/src/features/channel/components/channel-edit-button.tsx
index 37ece12d..e997df52 100644
--- a/src/features/channel/components/channel-edit-button.tsx
+++ b/src/features/channel/components/channel-edit-button.tsx
@@ -33,7 +33,7 @@ export const EditChannelButton = ({
                                   }: EditChannelButtonProps) => {
     const router = useRouter();
     const [isAddModalOpen, setIsAddModalOpen] = useState(false);
-    const isLocalSystem = channel.provider == "local";
+    const isLocalSystem = channel.provider === "local";
 
 
     const mutation = useMutation({
@@ -51,10 +51,10 @@ export const EditChannelButton = ({
             };
 
             let result: any;
-            if (kind == "notification") {
+            if (kind === "notification") {
                 // @ts-expect-error — payload type varies between notification and storage
                 result = await updateNotificationChannelAction(payload)
-            } else if (kind == "storage") {
+            } else if (kind === "storage") {
                 // @ts-expect-error — payload type varies between notification and storage
                 result = await updateStorageChannelAction(payload)
             } else {
diff --git a/src/features/channel/components/channel-form.tsx b/src/features/channel/components/channel-form.tsx
index 979130b7..4a0457c7 100644
--- a/src/features/channel/components/channel-form.tsx
+++ b/src/features/channel/components/channel-form.tsx
@@ -224,13 +224,11 @@ export const ChannelForm = ({onSuccessAction, organization, defaultValues, kind}
 
             <div className="flex justify-between mt-4">
                 <div>
-                    {(!isCreate || kind == "storage") && (
-                        <ChannelTestButton
-                            kind={kind}
-                            organizationId={organization?.id}
-                            channel={form.getValues()}
-                        />
-                    )}
+                    <ChannelTestButton
+                        kind={kind}
+                        organizationId={organization?.id}
+                        channel={form.getValues()}
+                    />
                 </div>
                 <div className="flex gap-2">
                     <Button
diff --git a/src/features/channel/components/channel-test-button.tsx b/src/features/channel/components/channel-test-button.tsx
index 549b8d43..5a4417a1 100644
--- a/src/features/channel/components/channel-test-button.tsx
+++ b/src/features/channel/components/channel-test-button.tsx
@@ -13,6 +13,7 @@ import {cn} from "@/lib/utils";
 import {StorageChannel} from "@/db/schema/12_storage-channel";
 import {ChannelKind} from "@/features/channel/components/channels-helpers";
 import type {StorageInput} from "@/features/storages/types";
+import type {NotificationChannelFormType} from "@/features/channel/schemas/channel-form.schema";
 import {dispatchStorage} from "@/features/storages/utils/storages.dispatch";
 
 
@@ -34,7 +35,7 @@ export const ChannelTestButton = ({channel, organizationId, kind}: NotifierTestC
                     message: `We are testing channel ${channel.name}`,
                     level: 'info',
                 };
-                const result = await dispatchNotification(payload, undefined, channel.id, organizationId);
+                const result = await dispatchNotification(payload, undefined, undefined, organizationId, channel as unknown as NotificationChannelFormType);
 
                 if (result.success) {
                     toast.success(result.message);
diff --git a/src/features/channel/components/channels-helpers.tsx b/src/features/channel/components/channels-helpers.tsx
index 9ce4924e..ab5ba197 100644
--- a/src/features/channel/components/channels-helpers.tsx
+++ b/src/features/channel/components/channels-helpers.tsx
@@ -1,49 +1,49 @@
 import {UseFormReturn} from "react-hook-form";
 import {
     NotifierSmtpForm
-} from "@/features/channel/components/notifications/smtp.form";
+} from "@/features/channel/components/notifications/smtp/smtp.form";
 import {
     NotifierSlackForm
-} from "@/features/channel/components/notifications/slack.form";
+} from "@/features/channel/components/notifications/slack/slack.form";
 import {
     NotifierDiscordForm
-} from "@/features/channel/components/notifications/discord.form";
+} from "@/features/channel/components/notifications/discord/discord.form";
 import {
     NotifierTelegramForm
-} from "@/features/channel/components/notifications/telegram.form";
+} from "@/features/channel/components/notifications/telegram/telegram.form";
 import {
     NotifierGotifyForm
-} from "@/features/channel/components/notifications/gotify.form";
+} from "@/features/channel/components/notifications/gotify/gotify.form";
 import {
     NotifierNtfyForm
-} from "@/features/channel/components/notifications/ntfy.form";
+} from "@/features/channel/components/notifications/ntfy/ntfy.form";
 import {
     NotifierWebhookForm
-} from "@/features/channel/components/notifications/webhook.form";
+} from "@/features/channel/components/notifications/webhook/webhook.form";
 import {
     NotifierNextcloudForm
-} from "@/features/channel/components/notifications/nextcloud.form";
+} from "@/features/channel/components/notifications/nextcloud/nextcloud.form";
 import {
     NotifierPushoverForm
-} from "@/features/channel/components/notifications/pushover.form";
+} from "@/features/channel/components/notifications/pushover/pushover.form";
 import {
     notificationProviders,
 } from "@/features/channel/components/channels-notification-helper";
 import {
     NotifierTeamsForm
-} from "@/features/channel/components/notifications/teams.form";
+} from "@/features/channel/components/notifications/teams/teams.form";
 import {storageProviders} from "@/features/channel/components/channels-storage-helper";
 import {ForwardRefExoticComponent, JSX, RefAttributes, SVGProps} from "react";
 import {LucideProps} from "lucide-react";
 import {
     StorageS3Form
-} from "@/features/channel/components/storages/s3.form";
+} from "@/features/channel/components/storages/s3/s3.form";
 import {
     StorageGoogleDriveForm
 } from "@/features/channel/components/storages/google-drive/google-drive.form";
 import {
     StorageBlobForm
-} from "@/features/channel/components/storages/az-blob.form";
+} from "@/features/channel/components/storages/az-blob/az-blob.form";
 import {
     StorageGoogleCloudStorageForm
 } from "@/features/channel/components/storages/google-cloud-storage/google-cloud-storage.form";
diff --git a/src/features/channel/components/notifications/discord.form.tsx b/src/features/channel/components/notifications/discord/discord.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/discord.form.tsx
rename to src/features/channel/components/notifications/discord/discord.form.tsx
diff --git a/src/features/channel/components/notifications/discord.schema.ts b/src/features/channel/components/notifications/discord/discord.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/discord.schema.ts
rename to src/features/channel/components/notifications/discord/discord.schema.ts
diff --git a/src/features/channel/components/notifications/discord.ts b/src/features/channel/components/notifications/discord/discord.ts
similarity index 100%
rename from src/features/channel/components/notifications/discord.ts
rename to src/features/channel/components/notifications/discord/discord.ts
diff --git a/src/features/channel/components/notifications/discord/index.ts b/src/features/channel/components/notifications/discord/index.ts
new file mode 100644
index 00000000..b8fb1334
--- /dev/null
+++ b/src/features/channel/components/notifications/discord/index.ts
@@ -0,0 +1 @@
+export * from "./discord";
diff --git a/src/features/channel/components/notifications/gotify.form.tsx b/src/features/channel/components/notifications/gotify/gotify.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/gotify.form.tsx
rename to src/features/channel/components/notifications/gotify/gotify.form.tsx
diff --git a/src/features/channel/components/notifications/gotify.schema.ts b/src/features/channel/components/notifications/gotify/gotify.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/gotify.schema.ts
rename to src/features/channel/components/notifications/gotify/gotify.schema.ts
diff --git a/src/features/channel/components/notifications/gotify.ts b/src/features/channel/components/notifications/gotify/gotify.ts
similarity index 100%
rename from src/features/channel/components/notifications/gotify.ts
rename to src/features/channel/components/notifications/gotify/gotify.ts
diff --git a/src/features/channel/components/notifications/gotify/index.ts b/src/features/channel/components/notifications/gotify/index.ts
new file mode 100644
index 00000000..19dcfbf1
--- /dev/null
+++ b/src/features/channel/components/notifications/gotify/index.ts
@@ -0,0 +1 @@
+export * from "./gotify";
diff --git a/src/features/channel/components/notifications/nextcloud/index.ts b/src/features/channel/components/notifications/nextcloud/index.ts
new file mode 100644
index 00000000..4c535e90
--- /dev/null
+++ b/src/features/channel/components/notifications/nextcloud/index.ts
@@ -0,0 +1 @@
+export * from "./nextcloud";
diff --git a/src/features/channel/components/notifications/nextcloud.form.tsx b/src/features/channel/components/notifications/nextcloud/nextcloud.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/nextcloud.form.tsx
rename to src/features/channel/components/notifications/nextcloud/nextcloud.form.tsx
diff --git a/src/features/channel/components/notifications/nextcloud.schema.ts b/src/features/channel/components/notifications/nextcloud/nextcloud.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/nextcloud.schema.ts
rename to src/features/channel/components/notifications/nextcloud/nextcloud.schema.ts
diff --git a/src/features/channel/components/notifications/nextcloud.ts b/src/features/channel/components/notifications/nextcloud/nextcloud.ts
similarity index 100%
rename from src/features/channel/components/notifications/nextcloud.ts
rename to src/features/channel/components/notifications/nextcloud/nextcloud.ts
diff --git a/src/features/channel/components/notifications/ntfy/index.ts b/src/features/channel/components/notifications/ntfy/index.ts
new file mode 100644
index 00000000..969ae71e
--- /dev/null
+++ b/src/features/channel/components/notifications/ntfy/index.ts
@@ -0,0 +1 @@
+export * from "./ntfy";
diff --git a/src/features/channel/components/notifications/ntfy.form.tsx b/src/features/channel/components/notifications/ntfy/ntfy.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/ntfy.form.tsx
rename to src/features/channel/components/notifications/ntfy/ntfy.form.tsx
diff --git a/src/features/channel/components/notifications/ntfy.schema.ts b/src/features/channel/components/notifications/ntfy/ntfy.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/ntfy.schema.ts
rename to src/features/channel/components/notifications/ntfy/ntfy.schema.ts
diff --git a/src/features/channel/components/notifications/ntfy.ts b/src/features/channel/components/notifications/ntfy/ntfy.ts
similarity index 100%
rename from src/features/channel/components/notifications/ntfy.ts
rename to src/features/channel/components/notifications/ntfy/ntfy.ts
diff --git a/src/features/channel/components/notifications/pushover/index.ts b/src/features/channel/components/notifications/pushover/index.ts
new file mode 100644
index 00000000..8bddb74c
--- /dev/null
+++ b/src/features/channel/components/notifications/pushover/index.ts
@@ -0,0 +1 @@
+export * from "./pushover";
diff --git a/src/features/channel/components/notifications/pushover.form.tsx b/src/features/channel/components/notifications/pushover/pushover.form.tsx
similarity index 99%
rename from src/features/channel/components/notifications/pushover.form.tsx
rename to src/features/channel/components/notifications/pushover/pushover.form.tsx
index 49416330..24abe2e5 100644
--- a/src/features/channel/components/notifications/pushover.form.tsx
+++ b/src/features/channel/components/notifications/pushover/pushover.form.tsx
@@ -4,7 +4,7 @@ import {Input} from "@/components/ui/input";
 import {Separator} from "@/components/ui/separator";
 import {PasswordInput} from "@/components/ui/password-input";
 import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from "@/components/ui/select";
-import {PUSHOVER_PRIORITIES} from "@/features/channel/components/notifications/pushover.schema";
+import {PUSHOVER_PRIORITIES} from "@/features/channel/components/notifications/pushover/pushover.schema";
 
 type NotifierPushoverFormProps = {
     form: UseFormReturn<any, any, any>;
diff --git a/src/features/channel/components/notifications/pushover.schema.ts b/src/features/channel/components/notifications/pushover/pushover.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/pushover.schema.ts
rename to src/features/channel/components/notifications/pushover/pushover.schema.ts
diff --git a/src/features/channel/components/notifications/pushover.ts b/src/features/channel/components/notifications/pushover/pushover.ts
similarity index 100%
rename from src/features/channel/components/notifications/pushover.ts
rename to src/features/channel/components/notifications/pushover/pushover.ts
diff --git a/src/features/channel/components/notifications/slack/index.ts b/src/features/channel/components/notifications/slack/index.ts
new file mode 100644
index 00000000..15b73e9c
--- /dev/null
+++ b/src/features/channel/components/notifications/slack/index.ts
@@ -0,0 +1 @@
+export * from "./slack";
diff --git a/src/features/channel/components/notifications/slack.form.tsx b/src/features/channel/components/notifications/slack/slack.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/slack.form.tsx
rename to src/features/channel/components/notifications/slack/slack.form.tsx
diff --git a/src/features/channel/components/notifications/slack.schema.ts b/src/features/channel/components/notifications/slack/slack.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/slack.schema.ts
rename to src/features/channel/components/notifications/slack/slack.schema.ts
diff --git a/src/features/channel/components/notifications/slack.ts b/src/features/channel/components/notifications/slack/slack.ts
similarity index 100%
rename from src/features/channel/components/notifications/slack.ts
rename to src/features/channel/components/notifications/slack/slack.ts
diff --git a/src/features/channel/components/notifications/smtp/index.ts b/src/features/channel/components/notifications/smtp/index.ts
new file mode 100644
index 00000000..08f1e4d1
--- /dev/null
+++ b/src/features/channel/components/notifications/smtp/index.ts
@@ -0,0 +1 @@
+export * from "./smtp";
diff --git a/src/features/channel/components/notifications/smtp.form.tsx b/src/features/channel/components/notifications/smtp/smtp.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/smtp.form.tsx
rename to src/features/channel/components/notifications/smtp/smtp.form.tsx
diff --git a/src/features/channel/components/notifications/smtp.schema.ts b/src/features/channel/components/notifications/smtp/smtp.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/smtp.schema.ts
rename to src/features/channel/components/notifications/smtp/smtp.schema.ts
diff --git a/src/features/channel/components/notifications/smtp.ts b/src/features/channel/components/notifications/smtp/smtp.ts
similarity index 100%
rename from src/features/channel/components/notifications/smtp.ts
rename to src/features/channel/components/notifications/smtp/smtp.ts
diff --git a/src/features/channel/components/notifications/teams/index.ts b/src/features/channel/components/notifications/teams/index.ts
new file mode 100644
index 00000000..9a463008
--- /dev/null
+++ b/src/features/channel/components/notifications/teams/index.ts
@@ -0,0 +1 @@
+export * from "./teams";
diff --git a/src/features/channel/components/notifications/teams.form.tsx b/src/features/channel/components/notifications/teams/teams.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/teams.form.tsx
rename to src/features/channel/components/notifications/teams/teams.form.tsx
diff --git a/src/features/channel/components/notifications/teams.schema.ts b/src/features/channel/components/notifications/teams/teams.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/teams.schema.ts
rename to src/features/channel/components/notifications/teams/teams.schema.ts
diff --git a/src/features/channel/components/notifications/teams.ts b/src/features/channel/components/notifications/teams/teams.ts
similarity index 100%
rename from src/features/channel/components/notifications/teams.ts
rename to src/features/channel/components/notifications/teams/teams.ts
diff --git a/src/features/channel/components/notifications/telegram/index.ts b/src/features/channel/components/notifications/telegram/index.ts
new file mode 100644
index 00000000..5ff7d504
--- /dev/null
+++ b/src/features/channel/components/notifications/telegram/index.ts
@@ -0,0 +1 @@
+export * from "./telegram";
diff --git a/src/features/channel/components/notifications/telegram.form.tsx b/src/features/channel/components/notifications/telegram/telegram.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/telegram.form.tsx
rename to src/features/channel/components/notifications/telegram/telegram.form.tsx
diff --git a/src/features/channel/components/notifications/telegram.schema.ts b/src/features/channel/components/notifications/telegram/telegram.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/telegram.schema.ts
rename to src/features/channel/components/notifications/telegram/telegram.schema.ts
diff --git a/src/features/channel/components/notifications/telegram.ts b/src/features/channel/components/notifications/telegram/telegram.ts
similarity index 100%
rename from src/features/channel/components/notifications/telegram.ts
rename to src/features/channel/components/notifications/telegram/telegram.ts
diff --git a/src/features/channel/components/notifications/webhook/index.ts b/src/features/channel/components/notifications/webhook/index.ts
new file mode 100644
index 00000000..2969a1c0
--- /dev/null
+++ b/src/features/channel/components/notifications/webhook/index.ts
@@ -0,0 +1 @@
+export * from "./webhook";
diff --git a/src/features/channel/components/notifications/webhook.form.tsx b/src/features/channel/components/notifications/webhook/webhook.form.tsx
similarity index 100%
rename from src/features/channel/components/notifications/webhook.form.tsx
rename to src/features/channel/components/notifications/webhook/webhook.form.tsx
diff --git a/src/features/channel/components/notifications/webhook.schema.ts b/src/features/channel/components/notifications/webhook/webhook.schema.ts
similarity index 100%
rename from src/features/channel/components/notifications/webhook.schema.ts
rename to src/features/channel/components/notifications/webhook/webhook.schema.ts
diff --git a/src/features/channel/components/notifications/webhook.ts b/src/features/channel/components/notifications/webhook/webhook.ts
similarity index 100%
rename from src/features/channel/components/notifications/webhook.ts
rename to src/features/channel/components/notifications/webhook/webhook.ts
diff --git a/src/features/channel/components/storages/az-blob.form.tsx b/src/features/channel/components/storages/az-blob/az-blob.form.tsx
similarity index 100%
rename from src/features/channel/components/storages/az-blob.form.tsx
rename to src/features/channel/components/storages/az-blob/az-blob.form.tsx
diff --git a/src/features/channel/components/storages/az-blob.schema.ts b/src/features/channel/components/storages/az-blob/az-blob.schema.ts
similarity index 100%
rename from src/features/channel/components/storages/az-blob.schema.ts
rename to src/features/channel/components/storages/az-blob/az-blob.schema.ts
diff --git a/src/features/channel/components/storages/az-blob.ts b/src/features/channel/components/storages/az-blob/az-blob.ts
similarity index 100%
rename from src/features/channel/components/storages/az-blob.ts
rename to src/features/channel/components/storages/az-blob/az-blob.ts
diff --git a/src/features/channel/components/storages/az-blob/index.ts b/src/features/channel/components/storages/az-blob/index.ts
new file mode 100644
index 00000000..a63b7dc8
--- /dev/null
+++ b/src/features/channel/components/storages/az-blob/index.ts
@@ -0,0 +1 @@
+export * from "./az-blob";
diff --git a/src/features/channel/components/storages/local/index.ts b/src/features/channel/components/storages/local/index.ts
new file mode 100644
index 00000000..1272f878
--- /dev/null
+++ b/src/features/channel/components/storages/local/index.ts
@@ -0,0 +1 @@
+export * from "./local";
diff --git a/src/features/channel/components/storages/local.schema.ts b/src/features/channel/components/storages/local/local.schema.ts
similarity index 100%
rename from src/features/channel/components/storages/local.schema.ts
rename to src/features/channel/components/storages/local/local.schema.ts
diff --git a/src/features/channel/components/storages/local.ts b/src/features/channel/components/storages/local/local.ts
similarity index 100%
rename from src/features/channel/components/storages/local.ts
rename to src/features/channel/components/storages/local/local.ts
diff --git a/src/features/channel/components/storages/s3/index.ts b/src/features/channel/components/storages/s3/index.ts
new file mode 100644
index 00000000..e50e1079
--- /dev/null
+++ b/src/features/channel/components/storages/s3/index.ts
@@ -0,0 +1 @@
+export * from "./s3";
diff --git a/src/features/channel/components/storages/s3.form.tsx b/src/features/channel/components/storages/s3/s3.form.tsx
similarity index 100%
rename from src/features/channel/components/storages/s3.form.tsx
rename to src/features/channel/components/storages/s3/s3.form.tsx
diff --git a/src/features/channel/components/storages/s3.schema.ts b/src/features/channel/components/storages/s3/s3.schema.ts
similarity index 100%
rename from src/features/channel/components/storages/s3.schema.ts
rename to src/features/channel/components/storages/s3/s3.schema.ts
diff --git a/src/features/channel/components/storages/s3.ts b/src/features/channel/components/storages/s3/s3.ts
similarity index 100%
rename from src/features/channel/components/storages/s3.ts
rename to src/features/channel/components/storages/s3/s3.ts
diff --git a/src/features/channel/schemas/channel-form.schema.ts b/src/features/channel/schemas/channel-form.schema.ts
index a6d77440..d75297d8 100644
--- a/src/features/channel/schemas/channel-form.schema.ts
+++ b/src/features/channel/schemas/channel-form.schema.ts
@@ -1,18 +1,18 @@
 import {z} from "zod";
-import {SlackChannelConfigSchema} from "@/features/channel/components/notifications/slack.schema";
-import {SmtpChannelConfigSchema} from "@/features/channel/components/notifications/smtp.schema";
-import {DiscordChannelConfigSchema} from "@/features/channel/components/notifications/discord.schema";
-import {TelegramChannelConfigSchema} from "@/features/channel/components/notifications/telegram.schema";
-import {GotifyChannelConfigSchema} from "@/features/channel/components/notifications/gotify.schema";
-import {NtfyChannelConfigSchema} from "@/features/channel/components/notifications/ntfy.schema";
-import {WebhookChannelConfigSchema} from "@/features/channel/components/notifications/webhook.schema";
-import {NextcloudChannelConfigSchema} from "@/features/channel/components/notifications/nextcloud.schema";
-import {PushoverChannelConfigSchema} from "@/features/channel/components/notifications/pushover.schema";
-import {S3ChannelConfigSchema} from "@/features/channel/components/storages/s3.schema";
+import {SlackChannelConfigSchema} from "@/features/channel/components/notifications/slack/slack.schema";
+import {SmtpChannelConfigSchema} from "@/features/channel/components/notifications/smtp/smtp.schema";
+import {DiscordChannelConfigSchema} from "@/features/channel/components/notifications/discord/discord.schema";
+import {TelegramChannelConfigSchema} from "@/features/channel/components/notifications/telegram/telegram.schema";
+import {GotifyChannelConfigSchema} from "@/features/channel/components/notifications/gotify/gotify.schema";
+import {NtfyChannelConfigSchema} from "@/features/channel/components/notifications/ntfy/ntfy.schema";
+import {WebhookChannelConfigSchema} from "@/features/channel/components/notifications/webhook/webhook.schema";
+import {NextcloudChannelConfigSchema} from "@/features/channel/components/notifications/nextcloud/nextcloud.schema";
+import {PushoverChannelConfigSchema} from "@/features/channel/components/notifications/pushover/pushover.schema";
+import {S3ChannelConfigSchema} from "@/features/channel/components/storages/s3/s3.schema";
 import {GoogleDriveChannelConfigSchema} from "@/features/channel/components/storages/google-drive/google-drive.schema";
-import {LocalChannelConfigSchema} from "@/features/channel/components/storages/local.schema";
-import {TeamsChannelConfigSchema} from "@/features/channel/components/notifications/teams.schema";
-import {BlobChannelConfigSchema} from "@/features/channel/components/storages/az-blob.schema";
+import {LocalChannelConfigSchema} from "@/features/channel/components/storages/local/local.schema";
+import {TeamsChannelConfigSchema} from "@/features/channel/components/notifications/teams/teams.schema";
+import {BlobChannelConfigSchema} from "@/features/channel/components/storages/az-blob/az-blob.schema";
 import {
     GoogleCloudStorageChannelConfigSchema
 } from "@/features/channel/components/storages/google-cloud-storage/google-cloud-storage.schema";
diff --git a/src/features/notifications/utils/notifications.dispatch.ts b/src/features/notifications/utils/notifications.dispatch.ts
index f255973e..28ad647e 100644
--- a/src/features/notifications/utils/notifications.dispatch.ts
+++ b/src/features/notifications/utils/notifications.dispatch.ts
@@ -6,13 +6,15 @@ import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {notificationLog} from "@/db/schema/11_notification-log";
 import {NotificationChannel} from "@/db/schema/09_notification-channel";
+import {NotificationChannelFormType} from "@/features/channel/schemas/channel-form.schema";
 import {Json} from "drizzle-zod";
 
 export async function dispatchNotification(
     payload: EventPayload,
     policyId?: string,
     channelId?: string,
-    organizationId?: string
+    organizationId?: string,
+    channelData?: NotificationChannelFormType
 ): Promise<DispatchResult> {
     try {
         let channel: NotificationChannel | null = null;
@@ -69,6 +71,10 @@ export async function dispatchNotification(
             };
         }
 
+        if (channelData) {
+            channel = {...channelData, config: channelData.config as Json};
+        }
+
         if (!channel) {
             return {
                 success: false,
@@ -95,28 +101,30 @@ export async function dispatchNotification(
             channel.id
         );
 
-        const [log] = await db
-            .insert(notificationLog)
-            .values({
-                channelId: channel.id,
-                policyId: policyId || null,
-                organizationId: organizationId || null,
+        if (!channelData) {
+            await db
+                .insert(notificationLog)
+                .values({
+                    channelId: channel.id,
+                    policyId: policyId || null,
+                    organizationId: organizationId || null,
 
-                provider: channel.provider,
-                providerName: channel.name,
-                event: payload.event as EventKind,
+                    provider: channel.provider,
+                    providerName: channel.name,
+                    event: payload.event as EventKind,
 
-                title: payload.title,
-                message: payload.message,
-                level: payload.level,
-                payload: payload.data || null,
-                success: result.success,
-                error: result.success ? null : result.error,
-                providerResponse: result.response || null,
-            })
-            .returning({id: notificationLog.id});
+                    title: payload.title,
+                    message: payload.message,
+                    level: payload.level,
+                    payload: payload.data || null,
+                    success: result.success,
+                    error: result.success ? null : result.error,
+                    providerResponse: result.response || null,
+                })
+                .returning({id: notificationLog.id});
+        }
 
-        return {...result, channelId: channel.id};
+        return {...result, channelId: channel.id ?? ""};
 
     } catch (err: any) {
         return {