diff --git a/apps/api/src/app/events/e2e/trigger-event.e2e.ts b/apps/api/src/app/events/e2e/trigger-event.e2e.ts
index 091602705d4..9fcc3c6e593 100644
--- a/apps/api/src/app/events/e2e/trigger-event.e2e.ts
+++ b/apps/api/src/app/events/e2e/trigger-event.e2e.ts
@@ -34,6 +34,7 @@ import {
   MESSAGE_GENERIC_RETENTION_DAYS,
 } from '@novu/shared';
 import { EmailEventStatusEnum } from '@novu/stateless';
+import { createTenant } from '../../tenant/e2e/create-tenant.e2e';
 
 const axiosInstance = axios.create();
 
@@ -65,6 +66,129 @@ describe(`Trigger event - ${eventTriggerPath} (POST)`, function () {
       subscriber = await subscriberService.createSubscriber();
     });
 
+    it('should use conditions to select integration', async function () {
+      const payload = {
+        providerId: EmailProviderIdEnum.Mailgun,
+        channel: 'email',
+        credentials: { apiKey: '123', secretKey: 'abc' },
+        _environmentId: session.environment._id,
+        conditions: [
+          {
+            children: [{ field: 'identifier', value: 'test', operator: 'EQUAL', on: 'tenant' }],
+          },
+        ],
+        active: true,
+        check: false,
+      };
+
+      await session.testAgent.post('/v1/integrations').send(payload);
+
+      template = await createTemplate(session, ChannelTypeEnum.EMAIL);
+
+      await createTenant({ session, identifier: 'test', name: 'test' });
+
+      await sendTrigger(session, template, subscriber.subscriberId, {}, {}, 'test');
+
+      await session.awaitRunningJobs(template._id);
+
+      const createdSubscriber = await subscriberRepository.findBySubscriberId(
+        session.environment._id,
+        subscriber.subscriberId
+      );
+
+      const message = await messageRepository.findOne({
+        _environmentId: session.environment._id,
+        _subscriberId: createdSubscriber?._id,
+        channel: ChannelTypeEnum.EMAIL,
+      });
+
+      expect(message?.providerId).to.equal(payload.providerId);
+    });
+
+    it('should use or conditions to select integration', async function () {
+      const payload = {
+        providerId: EmailProviderIdEnum.Mailgun,
+        channel: 'email',
+        credentials: { apiKey: '123', secretKey: 'abc' },
+        _environmentId: session.environment._id,
+        conditions: [
+          {
+            value: 'OR',
+            children: [
+              { field: 'identifier', value: 'test3', operator: 'EQUAL', on: 'tenant' },
+              { field: 'identifier', value: 'test2', operator: 'EQUAL', on: 'tenant' },
+            ],
+          },
+        ],
+        active: true,
+        check: false,
+      };
+
+      await session.testAgent.post('/v1/integrations').send(payload);
+
+      template = await createTemplate(session, ChannelTypeEnum.EMAIL);
+
+      await createTenant({ session, identifier: 'test3', name: 'test3' });
+      await createTenant({ session, identifier: 'test2', name: 'test2' });
+
+      await sendTrigger(session, template, subscriber.subscriberId, {}, {}, 'test3');
+
+      await session.awaitRunningJobs(template._id);
+
+      const createdSubscriber = await subscriberRepository.findBySubscriberId(
+        session.environment._id,
+        subscriber.subscriberId
+      );
+
+      const firstMessage = await messageRepository.findOne({
+        _environmentId: session.environment._id,
+        _subscriberId: createdSubscriber?._id,
+        channel: ChannelTypeEnum.EMAIL,
+      });
+
+      expect(firstMessage?.providerId).to.equal(payload.providerId);
+
+      await sendTrigger(session, template, subscriber.subscriberId, {}, {}, 'test2');
+
+      await session.awaitRunningJobs(template._id);
+
+      const secondMessage = await messageRepository.findOne({
+        _environmentId: session.environment._id,
+        _subscriberId: createdSubscriber?._id,
+        channel: ChannelTypeEnum.EMAIL,
+        _id: {
+          $ne: firstMessage?._id,
+        },
+      });
+
+      expect(secondMessage?.providerId).to.equal(payload.providerId);
+      expect(firstMessage?._id).to.not.equal(secondMessage?._id);
+    });
+
+    it('should return correct status when using a non existing tenant', async function () {
+      const payload = {
+        providerId: EmailProviderIdEnum.Mailgun,
+        channel: 'email',
+        credentials: { apiKey: '123', secretKey: 'abc' },
+        _environmentId: session.environment._id,
+        conditions: [
+          {
+            children: [{ field: 'identifier', value: 'test1', operator: 'EQUAL', on: 'tenant' }],
+          },
+        ],
+        active: true,
+        check: false,
+      };
+
+      await session.testAgent.post('/v1/integrations').send(payload);
+
+      template = await createTemplate(session, ChannelTypeEnum.EMAIL);
+
+      const result = await sendTrigger(session, template, subscriber.subscriberId, {}, {}, 'test1');
+
+      expect(result.data.data.status).to.equal('no_tenant_found');
+    });
+
     it('should trigger an event successfully', async function () {
       const response = await axiosInstance.post(
         `${session.serverUrl}${eventTriggerPath}`,
@@ -1848,7 +1972,8 @@ export async function sendTrigger(
   template,
   newSubscriberIdInAppNotification: string,
   payload: Record<string, unknown> = {},
-  overrides: Record<string, unknown> = {}
+  overrides: Record<string, unknown> = {},
+  tenant?: string
 ): Promise<AxiosResponse> {
   return await axiosInstance.post(
     `${session.serverUrl}${eventTriggerPath}`,
@@ -1861,6 +1986,7 @@ export async function sendTrigger(
         ...payload,
       },
       overrides,
+      tenant,
     },
     {
       headers: {
diff --git a/apps/api/src/app/events/usecases/parse-event-request/parse-event-request.usecase.ts b/apps/api/src/app/events/usecases/parse-event-request/parse-event-request.usecase.ts
index ec3655cc283..78cefae31d0 100644
--- a/apps/api/src/app/events/usecases/parse-event-request/parse-event-request.usecase.ts
+++ b/apps/api/src/app/events/usecases/parse-event-request/parse-event-request.usecase.ts
@@ -11,7 +11,7 @@ import {
   StorageHelperService,
   WorkflowQueueService,
 } from '@novu/application-generic';
-import { NotificationTemplateRepository, NotificationTemplateEntity } from '@novu/dal';
+import { NotificationTemplateRepository, NotificationTemplateEntity, TenantRepository } from '@novu/dal';
 import {
   ISubscribersDefine,
   ITenantDefine,
@@ -35,7 +35,8 @@ export class ParseEventRequest {
     private verifyPayload: VerifyPayload,
     private storageHelperService: StorageHelperService,
     private workflowQueueService: WorkflowQueueService,
-    private mapTriggerRecipients: MapTriggerRecipients
+    private mapTriggerRecipients: MapTriggerRecipients,
+    private tenantRepository: TenantRepository
   ) {}
 
   @InstrumentUsecase()
@@ -90,6 +91,17 @@ export class ParseEventRequest {
       };
     }
 
+    if (command.tenant) {
+      try {
+        await this.validateTenant(typeof command.tenant === 'string' ? command.tenant : command.tenant.identifier);
+      } catch (e) {
+        return {
+          acknowledged: true,
+          status: 'no_tenant_found',
+        };
+      }
+    }
+
     Sentry.addBreadcrumb({
       message: 'Sending trigger',
       data: {
@@ -146,6 +158,15 @@ export class ParseEventRequest {
     );
   }
 
+  private async validateTenant(identifier: string) {
+    const found = await this.tenantRepository.findOne({
+      identifier,
+    });
+    if (!found) {
+      throw new ApiException(`Tenant with identifier ${identifier} cound not be found`);
+    }
+  }
+
   @Instrument()
   private async validateSubscriberIdProperty(to: ISubscribersDefine[]): Promise<boolean> {
     for (const subscriber of to) {
diff --git a/apps/api/src/app/integrations/dtos/create-integration-request.dto.ts b/apps/api/src/app/integrations/dtos/create-integration-request.dto.ts
index 8e1bb5aba3d..324735cb258 100644
--- a/apps/api/src/app/integrations/dtos/create-integration-request.dto.ts
+++ b/apps/api/src/app/integrations/dtos/create-integration-request.dto.ts
@@ -1,9 +1,19 @@
-import { IsBoolean, IsDefined, IsEnum, IsMongoId, IsOptional, IsString, ValidateNested } from 'class-validator';
+import {
+  IsArray,
+  IsBoolean,
+  IsDefined,
+  IsEnum,
+  IsMongoId,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import { ChannelTypeEnum, ICreateIntegrationBodyDto } from '@novu/shared';
 
 import { CredentialsDto } from './credentials.dto';
+import { StepFilter } from '../../shared/dtos/step-filter';
 
 export class CreateIntegrationRequestDto implements ICreateIntegrationBodyDto {
   @ApiPropertyOptional({ type: String })
@@ -53,4 +63,12 @@ export class CreateIntegrationRequestDto implements ICreateIntegrationBodyDto {
   @IsOptional()
   @IsBoolean()
   check?: boolean;
+
+  @ApiPropertyOptional({
+    type: [StepFilter],
+  })
+  @IsArray()
+  @IsOptional()
+  @ValidateNested({ each: true })
+  conditions?: StepFilter[];
 }
diff --git a/apps/api/src/app/integrations/dtos/integration-response.dto.ts b/apps/api/src/app/integrations/dtos/integration-response.dto.ts
index a3a4551a387..5c3e0fe95c1 100644
--- a/apps/api/src/app/integrations/dtos/integration-response.dto.ts
+++ b/apps/api/src/app/integrations/dtos/integration-response.dto.ts
@@ -1,5 +1,6 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { ChannelTypeEnum } from '@novu/shared';
+import { StepFilter } from '../../shared/dtos/step-filter';
 import { CredentialsDto } from './credentials.dto';
 
 export class IntegrationResponseDto {
@@ -45,4 +46,9 @@ export class IntegrationResponseDto {
 
   @ApiProperty()
   primary: boolean;
+
+  @ApiPropertyOptional({
+    type: [StepFilter],
+  })
+  conditions?: StepFilter[];
 }
diff --git a/apps/api/src/app/integrations/dtos/update-integration.dto.ts b/apps/api/src/app/integrations/dtos/update-integration.dto.ts
index bdb7ee1a052..4ccc2b59beb 100644
--- a/apps/api/src/app/integrations/dtos/update-integration.dto.ts
+++ b/apps/api/src/app/integrations/dtos/update-integration.dto.ts
@@ -1,8 +1,9 @@
 import { ApiPropertyOptional } from '@nestjs/swagger';
 import { IUpdateIntegrationBodyDto } from '@novu/shared';
-import { IsBoolean, IsMongoId, IsOptional, IsString, ValidateNested } from 'class-validator';
+import { IsArray, IsBoolean, IsMongoId, IsOptional, IsString, ValidateNested } from 'class-validator';
 import { CredentialsDto } from './credentials.dto';
 import { Type } from 'class-transformer';
+import { StepFilter } from '../../shared/dtos/step-filter';
 
 export class UpdateIntegrationRequestDto implements IUpdateIntegrationBodyDto {
   @ApiPropertyOptional({ type: String })
@@ -40,4 +41,12 @@ export class UpdateIntegrationRequestDto implements IUpdateIntegrationBodyDto {
   @IsOptional()
   @IsBoolean()
   check?: boolean;
+
+  @ApiPropertyOptional({
+    type: [StepFilter],
+  })
+  @IsArray()
+  @IsOptional()
+  @ValidateNested({ each: true })
+  conditions?: StepFilter[];
 }
diff --git a/apps/api/src/app/integrations/e2e/create-integration.e2e.ts b/apps/api/src/app/integrations/e2e/create-integration.e2e.ts
index 646d2419949..5d3399c3111 100644
--- a/apps/api/src/app/integrations/e2e/create-integration.e2e.ts
+++ b/apps/api/src/app/integrations/e2e/create-integration.e2e.ts
@@ -104,6 +104,50 @@ describe('Create Integration - /integration (POST)', function () {
     }
   });
 
+  it('should create integration with conditions', async function () {
+    const payload = {
+      providerId: EmailProviderIdEnum.SendGrid,
+      channel: ChannelTypeEnum.EMAIL,
+      identifier: 'identifier-conditions',
+      active: false,
+      check: false,
+      conditions: [
+        {
+          children: [{ field: 'identifier', value: 'test', operator: 'EQUAL', on: 'tenant' }],
+        },
+      ],
+    };
+
+    const { body } = await session.testAgent.post('/v1/integrations').send(payload);
+
+    expect(body.data.conditions.length).to.equal(1);
+    expect(body.data.conditions[0].children.length).to.equal(1);
+    expect(body.data.conditions[0].children[0].on).to.equal('tenant');
+    expect(body.data.conditions[0].children[0].field).to.equal('identifier');
+    expect(body.data.conditions[0].children[0].value).to.equal('test');
+    expect(body.data.conditions[0].children[0].operator).to.equal('EQUAL');
+  });
+
+  it('should return error with malformed conditions', async function () {
+    const payload = {
+      providerId: EmailProviderIdEnum.SendGrid,
+      channel: ChannelTypeEnum.EMAIL,
+      identifier: 'identifier-conditions',
+      active: false,
+      check: false,
+      conditions: [
+        {
+          children: 'test',
+        },
+      ],
+    };
+
+    const { body } = await session.testAgent.post('/v1/integrations').send(payload);
+
+    expect(body.statusCode).to.equal(400);
+    expect(body.error).to.equal('Bad Request');
+  });
+
   it('should not allow to create integration with same identifier', async function () {
     const payload = {
       providerId: EmailProviderIdEnum.SendGrid,
diff --git a/apps/api/src/app/integrations/e2e/set-itegration-as-primary.e2e.ts b/apps/api/src/app/integrations/e2e/set-itegration-as-primary.e2e.ts
index db3805efa7a..1e32cde3ee0 100644
--- a/apps/api/src/app/integrations/e2e/set-itegration-as-primary.e2e.ts
+++ b/apps/api/src/app/integrations/e2e/set-itegration-as-primary.e2e.ts
@@ -65,6 +65,34 @@ describe('Set Integration As Primary - /integrations/:integrationId/set-primary
     expect(body.message).to.equal(`Channel ${inAppIntegration.channel} does not support primary`);
   });
 
+  it('clears conditions when set as primary', async () => {
+    await integrationRepository.deleteMany({
+      _organizationId: session.organization._id,
+      _environmentId: session.environment._id,
+    });
+
+    const integration = await integrationRepository.create({
+      name: 'Email with conditions',
+      identifier: 'identifier1',
+      providerId: EmailProviderIdEnum.SendGrid,
+      channel: ChannelTypeEnum.EMAIL,
+      active: false,
+      _organizationId: session.organization._id,
+      _environmentId: session.environment._id,
+      conditions: [{}],
+    });
+
+    await session.testAgent.post(`/v1/integrations/${integration._id}/set-primary`).send({});
+
+    const found = await integrationRepository.findOne({
+      _id: integration._id,
+      _organizationId: session.organization._id,
+    });
+
+    expect(found?.conditions).to.deep.equal([]);
+    expect(found?.primary).to.equal(true);
+  });
+
   it('push channel does not support primary flag, then for integration it should throw bad request exception', async () => {
     await integrationRepository.deleteMany({
       _organizationId: session.organization._id,
diff --git a/apps/api/src/app/integrations/e2e/update-integration.e2e.ts b/apps/api/src/app/integrations/e2e/update-integration.e2e.ts
index 45768f84476..4cbc2ec7c42 100644
--- a/apps/api/src/app/integrations/e2e/update-integration.e2e.ts
+++ b/apps/api/src/app/integrations/e2e/update-integration.e2e.ts
@@ -6,6 +6,7 @@ import {
   ChatProviderIdEnum,
   EmailProviderIdEnum,
   InAppProviderIdEnum,
+  ITenantFilterPart,
   PushProviderIdEnum,
 } from '@novu/shared';
 
@@ -66,6 +67,68 @@ describe('Update Integration - /integrations/:integrationId (PUT)', function ()
     expect(integration.credentials.secretKey).to.equal(payload.credentials.secretKey);
   });
 
+  it('should update conditions on integration', async function () {
+    const payload = {
+      providerId: EmailProviderIdEnum.SendGrid,
+      channel: ChannelTypeEnum.EMAIL,
+      credentials: { apiKey: 'SG.123', secretKey: 'abc' },
+      active: true,
+      check: false,
+      conditions: [
+        {
+          children: [{ field: 'identifier', value: 'test', operator: 'EQUAL', on: 'tenant' }],
+        },
+      ],
+    };
+
+    const data = (await session.testAgent.get(`/v1/integrations`)).body.data;
+
+    const integration = data.find((i) => i.primary && i.channel === 'email');
+
+    expect(integration.conditions.length).to.equal(0);
+
+    await session.testAgent.put(`/v1/integrations/${integration._id}`).send(payload);
+
+    const result = await integrationRepository.findOne({
+      _id: integration._id,
+      _organizationId: session.organization._id,
+    });
+
+    expect(result?.conditions?.length).to.equal(1);
+    expect(result?.primary).to.equal(false);
+    expect(result?.conditions?.at(0)?.children.length).to.equal(1);
+    expect(result?.conditions?.at(0)?.children.at(0)?.on).to.equal('tenant');
+    expect((result?.conditions?.at(0)?.children.at(0) as ITenantFilterPart)?.field).to.equal('identifier');
+    expect((result?.conditions?.at(0)?.children.at(0) as ITenantFilterPart)?.value).to.equal('test');
+    expect((result?.conditions?.at(0)?.children.at(0) as ITenantFilterPart)?.operator).to.equal('EQUAL');
+  });
+
+  it('should return error with malformed conditions', async function () {
+    const payload = {
+      providerId: EmailProviderIdEnum.SendGrid,
+      channel: ChannelTypeEnum.EMAIL,
+      credentials: { apiKey: 'SG.123', secretKey: 'abc' },
+      active: true,
+      check: false,
+      conditions: [
+        {
+          children: 'test',
+        },
+      ],
+    };
+
+    const data = (await session.testAgent.get(`/v1/integrations`)).body.data;
+
+    const integration = data.find((i) => i.primary && i.channel === 'email');
+
+    expect(integration.conditions.length).to.equal(0);
+
+    const { body } = await session.testAgent.put(`/v1/integrations/${integration._id}`).send(payload);
+
+    expect(body.statusCode).to.equal(400);
+    expect(body.error).to.equal('Bad Request');
+  });
+
   it('should not allow to update the integration with same identifier', async function () {
     const identifier2 = 'identifier2';
     const integrationOne = await integrationRepository.create({
diff --git a/apps/api/src/app/integrations/integrations.controller.ts b/apps/api/src/app/integrations/integrations.controller.ts
index 3f8b0c984ce..0b3ecb9043a 100644
--- a/apps/api/src/app/integrations/integrations.controller.ts
+++ b/apps/api/src/app/integrations/integrations.controller.ts
@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   Body,
   ClassSerializerInterceptor,
   Controller,
@@ -135,20 +136,29 @@ export class IntegrationsController {
     @UserSession() user: IJwtPayload,
     @Body() body: CreateIntegrationRequestDto
   ): Promise<IntegrationResponseDto> {
-    return await this.createIntegrationUsecase.execute(
-      CreateIntegrationCommand.create({
-        userId: user._id,
-        name: body.name,
-        identifier: body.identifier,
-        environmentId: body._environmentId ?? user.environmentId,
-        organizationId: user.organizationId,
-        providerId: body.providerId,
-        channel: body.channel,
-        credentials: body.credentials,
-        active: body.active ?? false,
-        check: body.check ?? true,
-      })
-    );
+    try {
+      return await this.createIntegrationUsecase.execute(
+        CreateIntegrationCommand.create({
+          userId: user._id,
+          name: body.name,
+          identifier: body.identifier,
+          environmentId: body._environmentId ?? user.environmentId,
+          organizationId: user.organizationId,
+          providerId: body.providerId,
+          channel: body.channel,
+          credentials: body.credentials,
+          active: body.active ?? false,
+          check: body.check ?? true,
+          conditions: body.conditions,
+        })
+      );
+    } catch (e) {
+      if (e.message.includes('Integration validation failed') || e.message.includes('Cast to embedded')) {
+        throw new BadRequestException(e.message);
+      }
+
+      throw e;
+    }
   }
 
   @Put('/:integrationId')
@@ -161,25 +171,34 @@ export class IntegrationsController {
     summary: 'Update integration',
   })
   @ExternalApiAccessible()
-  updateIntegrationById(
+  async updateIntegrationById(
     @UserSession() user: IJwtPayload,
     @Param('integrationId') integrationId: string,
     @Body() body: UpdateIntegrationRequestDto
   ): Promise<IntegrationResponseDto> {
-    return this.updateIntegrationUsecase.execute(
-      UpdateIntegrationCommand.create({
-        userId: user._id,
-        name: body.name,
-        identifier: body.identifier,
-        environmentId: body._environmentId,
-        userEnvironmentId: user.environmentId,
-        organizationId: user.organizationId,
-        integrationId,
-        credentials: body.credentials,
-        active: body.active,
-        check: body.check ?? true,
-      })
-    );
+    try {
+      return await this.updateIntegrationUsecase.execute(
+        UpdateIntegrationCommand.create({
+          userId: user._id,
+          name: body.name,
+          identifier: body.identifier,
+          environmentId: body._environmentId,
+          userEnvironmentId: user.environmentId,
+          organizationId: user.organizationId,
+          integrationId,
+          credentials: body.credentials,
+          active: body.active,
+          check: body.check ?? true,
+          conditions: body.conditions,
+        })
+      );
+    } catch (e) {
+      if (e.message.includes('Integration validation failed') || e.message.includes('Cast to embedded')) {
+        throw new BadRequestException(e.message);
+      }
+
+      throw e;
+    }
   }
 
   @Post('/:integrationId/set-primary')
diff --git a/apps/api/src/app/integrations/usecases/create-integration/create-integration.command.ts b/apps/api/src/app/integrations/usecases/create-integration/create-integration.command.ts
index 90c00c11105..d425a29ea21 100644
--- a/apps/api/src/app/integrations/usecases/create-integration/create-integration.command.ts
+++ b/apps/api/src/app/integrations/usecases/create-integration/create-integration.command.ts
@@ -1,7 +1,8 @@
-import { IsDefined, IsEnum, IsOptional, IsString } from 'class-validator';
+import { IsArray, IsDefined, IsEnum, IsOptional, IsString, ValidateNested } from 'class-validator';
 import { ChannelTypeEnum, ICredentialsDto } from '@novu/shared';
 
 import { EnvironmentCommand } from '../../../shared/commands/project.command';
+import { MessageFilter } from '../../../workflows/usecases/create-notification-template';
 
 export class CreateIntegrationCommand extends EnvironmentCommand {
   @IsOptional()
@@ -31,4 +32,9 @@ export class CreateIntegrationCommand extends EnvironmentCommand {
 
   @IsDefined()
   userId: string;
+
+  @IsOptional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  conditions?: MessageFilter[];
 }
diff --git a/apps/api/src/app/integrations/usecases/create-integration/create-integration.usecase.ts b/apps/api/src/app/integrations/usecases/create-integration/create-integration.usecase.ts
index 6d8163ce6dc..73d2893d3d3 100644
--- a/apps/api/src/app/integrations/usecases/create-integration/create-integration.usecase.ts
+++ b/apps/api/src/app/integrations/usecases/create-integration/create-integration.usecase.ts
@@ -69,6 +69,10 @@ export class CreateIntegration {
       result.priority = highestPriorityIntegration ? highestPriorityIntegration.priority + 1 : 1;
     }
 
+    if (command.conditions && command.conditions.length > 0) {
+      return result;
+    }
+
     const activeIntegrationsCount = await this.integrationRepository.countActiveExcludingNovu({
       _organizationId: command.organizationId,
       _environmentId: command.environmentId,
@@ -176,6 +180,7 @@ export class CreateIntegration {
         channel: command.channel,
         credentials: encryptCredentials(command.credentials ?? {}),
         active: command.active,
+        conditions: command.conditions,
       };
 
       const isActiveAndChannelSupportsPrimary = command.active && CHANNELS_WITH_PRIMARY.includes(command.channel);
diff --git a/apps/api/src/app/integrations/usecases/index.ts b/apps/api/src/app/integrations/usecases/index.ts
index d04e0dabab5..3a236504c10 100644
--- a/apps/api/src/app/integrations/usecases/index.ts
+++ b/apps/api/src/app/integrations/usecases/index.ts
@@ -1,4 +1,9 @@
-import { SelectIntegration, GetDecryptedIntegrations, CalculateLimitNovuIntegration } from '@novu/application-generic';
+import {
+  SelectIntegration,
+  GetDecryptedIntegrations,
+  CalculateLimitNovuIntegration,
+  ConditionsFilter,
+} from '@novu/application-generic';
 
 import { GetWebhookSupportStatus } from './get-webhook-support-status/get-webhook-support-status.usecase';
 import { CreateIntegration } from './create-integration/create-integration.usecase';
@@ -18,6 +23,7 @@ export const USE_CASES = [
   GetInAppActivated,
   GetWebhookSupportStatus,
   CreateIntegration,
+  ConditionsFilter,
   GetIntegrations,
   GetActiveIntegrations,
   SelectIntegration,
diff --git a/apps/api/src/app/integrations/usecases/set-integration-as-primary/set-integration-as-primary.usecase.ts b/apps/api/src/app/integrations/usecases/set-integration-as-primary/set-integration-as-primary.usecase.ts
index 3643c39f5b3..b6cf7c877a0 100644
--- a/apps/api/src/app/integrations/usecases/set-integration-as-primary/set-integration-as-primary.usecase.ts
+++ b/apps/api/src/app/integrations/usecases/set-integration-as-primary/set-integration-as-primary.usecase.ts
@@ -46,6 +46,7 @@ export class SetIntegrationAsPrimary {
         $set: {
           active: true,
           primary: true,
+          conditions: [],
         },
       }
     );
diff --git a/apps/api/src/app/integrations/usecases/update-integration/update-integration.command.ts b/apps/api/src/app/integrations/usecases/update-integration/update-integration.command.ts
index 69211eebaa2..9b8d2a2db38 100644
--- a/apps/api/src/app/integrations/usecases/update-integration/update-integration.command.ts
+++ b/apps/api/src/app/integrations/usecases/update-integration/update-integration.command.ts
@@ -1,7 +1,9 @@
-import { IsDefined, IsMongoId, IsOptional, IsString } from 'class-validator';
+import { IsArray, IsDefined, IsMongoId, IsOptional, IsString, ValidateNested } from 'class-validator';
 import { ICredentialsDto } from '@novu/shared';
 
 import { OrganizationCommand } from '../../../shared/commands/organization.command';
+import { StepFilter } from '../../../shared/dtos/step-filter';
+import { MessageFilter } from '../../../workflows/usecases/create-notification-template';
 
 export class UpdateIntegrationCommand extends OrganizationCommand {
   @IsOptional()
@@ -31,4 +33,9 @@ export class UpdateIntegrationCommand extends OrganizationCommand {
 
   @IsOptional()
   check?: boolean;
+
+  @IsOptional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  conditions?: MessageFilter[];
 }
diff --git a/apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts b/apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts
index d8c1016f505..637aed8881c 100644
--- a/apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts
+++ b/apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts
@@ -31,8 +31,10 @@ export class UpdateIntegration {
 
   private async calculatePriorityAndPrimaryForActive({
     existingIntegration,
+    conditionsApplied = false,
   }: {
     existingIntegration: IntegrationEntity;
+    conditionsApplied?: boolean;
   }) {
     const result: { primary: boolean; priority: number } = {
       primary: existingIntegration.primary,
@@ -74,15 +76,21 @@ export class UpdateIntegration {
       result.primary = true;
     }
 
+    if (conditionsApplied) {
+      result.primary = false;
+    }
+
     return result;
   }
 
   private async calculatePriorityAndPrimary({
     existingIntegration,
     active,
+    conditionsApplied = false,
   }: {
     existingIntegration: IntegrationEntity;
     active: boolean;
+    conditionsApplied?: boolean;
   }) {
     let result: { primary: boolean; priority: number } = {
       primary: existingIntegration.primary,
@@ -92,6 +100,7 @@ export class UpdateIntegration {
     if (active) {
       result = await this.calculatePriorityAndPrimaryForActive({
         existingIntegration,
+        conditionsApplied,
       });
     } else {
       await this.integrationRepository.recalculatePriorityForAllActive({
@@ -182,6 +191,10 @@ export class UpdateIntegration {
       updatePayload.credentials = encryptCredentials(command.credentials);
     }
 
+    if (command.conditions) {
+      updatePayload.conditions = command.conditions;
+    }
+
     if (!Object.keys(updatePayload).length) {
       throw new BadRequestException('No properties found for update');
     }
@@ -194,6 +207,8 @@ export class UpdateIntegration {
       })
     );
 
+    const haveConditions = updatePayload.conditions && updatePayload.conditions?.length > 0;
+
     const isChannelSupportsPrimary = CHANNELS_WITH_PRIMARY.includes(existingIntegration.channel);
     if (isMultiProviderConfigurationEnabled && isActiveChanged && isChannelSupportsPrimary) {
       if (command.active) {
@@ -209,12 +224,19 @@ export class UpdateIntegration {
       const { primary, priority } = await this.calculatePriorityAndPrimary({
         existingIntegration,
         active: !!command.active,
+        conditionsApplied: haveConditions,
       });
 
       updatePayload.primary = primary;
       updatePayload.priority = priority;
     }
 
+    const shouldRemovePrimary = haveConditions && existingIntegration.primary;
+
+    if (shouldRemovePrimary) {
+      updatePayload.primary = false;
+    }
+
     await this.integrationRepository.update(
       {
         _id: existingIntegration._id,
@@ -225,6 +247,15 @@ export class UpdateIntegration {
       }
     );
 
+    if (shouldRemovePrimary) {
+      await this.integrationRepository.recalculatePriorityForAllActive({
+        _id: existingIntegration._id,
+        _organizationId: existingIntegration._organizationId,
+        _environmentId: existingIntegration._organizationId,
+        channel: existingIntegration.channel,
+      });
+    }
+
     if (
       !isMultiProviderConfigurationEnabled &&
       command.active &&
diff --git a/apps/api/src/app/shared/dtos/step-filter.ts b/apps/api/src/app/shared/dtos/step-filter.ts
index 449b5c9d8a7..cd06682db44 100644
--- a/apps/api/src/app/shared/dtos/step-filter.ts
+++ b/apps/api/src/app/shared/dtos/step-filter.ts
@@ -97,12 +97,21 @@ class PreviousStepFilterPart extends BaseFilterPart {
   stepType: PreviousStepTypeEnum;
 }
 
+class TenantFilterPart extends BaseFieldFilterPart {
+  @ApiProperty({
+    enum: [FilterPartTypeEnum.TENANT],
+    description: 'Only on integrations right now',
+  })
+  on: FilterPartTypeEnum.TENANT;
+}
+
 type FilterParts =
   | FieldFilterPart
   | WebhookFilterPart
   | RealtimeOnlineFilterPart
   | OnlineInLastFilterPart
-  | PreviousStepFilterPart;
+  | PreviousStepFilterPart
+  | TenantFilterPart;
 
 export class StepFilter {
   @ApiProperty()
@@ -125,6 +134,7 @@ export class StepFilter {
       RealtimeOnlineFilterPart,
       OnlineInLastFilterPart,
       PreviousStepFilterPart,
+      TenantFilterPart,
     ],
   })
   children: FilterParts[];
diff --git a/apps/api/src/app/widgets/usecases/initialize-session/initialize-session.usecase.ts b/apps/api/src/app/widgets/usecases/initialize-session/initialize-session.usecase.ts
index 2db361686c3..80027dabef8 100644
--- a/apps/api/src/app/widgets/usecases/initialize-session/initialize-session.usecase.ts
+++ b/apps/api/src/app/widgets/usecases/initialize-session/initialize-session.usecase.ts
@@ -42,6 +42,7 @@ export class InitializeSession {
         userId: command.subscriberId,
         channelType: ChannelTypeEnum.IN_APP,
         providerId: InAppProviderIdEnum.Novu,
+        filterData: {},
       })
     );
 
diff --git a/apps/web/cypress/tests/integrations-list-page.spec.ts b/apps/web/cypress/tests/integrations-list-page.spec.ts
index f90fbd0a27e..0f59121bbb8 100644
--- a/apps/web/cypress/tests/integrations-list-page.spec.ts
+++ b/apps/web/cypress/tests/integrations-list-page.spec.ts
@@ -30,6 +30,21 @@ describe('Integrations List Page', function () {
       .as('session');
   });
 
+  const interceptIntegrationRequests = () => {
+    cy.intercept('GET', '*/integrations', async () => {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }).as('getIntegrations');
+    cy.intercept('POST', '*/integrations', async () => {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }).as('createIntegration');
+    cy.intercept('*/environments').as('getEnvironments');
+
+    cy.visit('/integrations');
+
+    cy.wait('@getIntegrations');
+    cy.wait('@getEnvironments');
+  };
+
   const checkTableLoading = () => {
     cy.getByTestId('integration-name-cell-loading').should('have.length', 10).first().should('be.visible');
     cy.getByTestId('integration-provider-cell-loading').should('have.length', 10).first().should('be.visible');
@@ -46,6 +61,7 @@ describe('Integrations List Page', function () {
       channel,
       environment,
       status,
+      conditions,
     }: {
       name: string;
       isFree?: boolean;
@@ -53,6 +69,7 @@ describe('Integrations List Page', function () {
       channel: string;
       environment?: string;
       status: string;
+      conditions?: number;
     },
     nth: number
   ) => {
@@ -95,6 +112,14 @@ describe('Integrations List Page', function () {
         .should('be.visible')
         .contains(environment);
     }
+    if (conditions) {
+      cy.get('@integrations-table')
+        .get('tr')
+        .eq(nth)
+        .getByTestId('integration-conditions-cell')
+        .should('be.visible')
+        .contains(conditions);
+    }
 
     cy.get('@integrations-table')
       .get('tr')
@@ -398,7 +423,7 @@ describe('Integrations List Page', function () {
     cy.getByTestId('select-provider-sidebar-next').should('be.disabled').contains('Next');
   });
 
-  it('should show emply search results', () => {
+  it('should show empty search results', () => {
     cy.intercept('*/integrations', async () => {
       await new Promise((resolve) => setTimeout(resolve, 1000));
     }).as('getIntegrations');
@@ -535,18 +560,39 @@ describe('Integrations List Page', function () {
   });
 
   it('should create a new mailjet integration', () => {
-    cy.intercept('GET', '*/integrations', async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }).as('getIntegrations');
-    cy.intercept('POST', '*/integrations', async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }).as('createIntegration');
-    cy.intercept('*/environments').as('getEnvironments');
+    interceptIntegrationRequests();
 
-    cy.visit('/integrations');
+    cy.getByTestId('add-provider').should('be.enabled').click();
+    cy.location('pathname').should('equal', '/integrations/create');
+    cy.getByTestId('select-provider-sidebar').should('be.visible');
 
-    cy.wait('@getIntegrations');
-    cy.wait('@getEnvironments');
+    cy.getByTestId(`provider-${EmailProviderIdEnum.Mailjet}`).contains('Mailjet').click();
+    cy.getByTestId('select-provider-sidebar-next').should('not.be.disabled').contains('Next').click();
+
+    cy.location('pathname').should('equal', '/integrations/create/email/mailjet');
+    cy.getByTestId('provider-instance-name').clear().type('Mailjet Integration');
+    cy.getByTestId('create-provider-instance-sidebar-create').should('not.be.disabled').contains('Create').click();
+    cy.getByTestId('create-provider-instance-sidebar-create').should('be.disabled');
+
+    cy.wait('@createIntegration');
+
+    cy.getByTestId('update-provider-sidebar').should('be.visible');
+    cy.location('pathname').should('contain', '/integrations/');
+
+    checkTableRow(
+      {
+        name: 'Mailjet Integration',
+        provider: 'Mailjet',
+        channel: 'Email',
+        environment: 'Development',
+        status: 'Disabled',
+      },
+      6
+    );
+  });
+
+  it('should create a new mailjet integration with conditions', () => {
+    interceptIntegrationRequests();
 
     cy.getByTestId('add-provider').should('be.enabled').click();
     cy.location('pathname').should('equal', '/integrations/create');
@@ -557,12 +603,27 @@ describe('Integrations List Page', function () {
 
     cy.location('pathname').should('equal', '/integrations/create/email/mailjet');
     cy.getByTestId('provider-instance-name').clear().type('Mailjet Integration');
+    cy.getByTestId('add-conditions-btn').click();
+    cy.getByTestId('conditions-form-title').contains('Conditions for Mailjet Integration provider instance');
+    cy.getByTestId('add-new-condition').click();
+    cy.getByTestId('conditions-form-on').should('have.value', 'Tenant');
+    cy.getByTestId('conditions-form-key').should('have.value', 'Identifier');
+    cy.getByTestId('conditions-form-operator').should('have.value', 'Equal');
+    cy.getByTestId('conditions-form-value').type('tenant123');
+    cy.getByTestId('apply-conditions-btn').click();
+    cy.getByTestId('add-conditions-btn').contains('Edit conditions');
+
     cy.getByTestId('create-provider-instance-sidebar-create').should('not.be.disabled').contains('Create').click();
     cy.getByTestId('create-provider-instance-sidebar-create').should('be.disabled');
 
     cy.wait('@createIntegration');
 
     cy.getByTestId('update-provider-sidebar').should('be.visible');
+    cy.getByTestId('header-add-conditions-btn').contains('1').click();
+    cy.getByTestId('add-new-condition').click();
+    cy.getByTestId('conditions-form-value').last().type('tenant456');
+    cy.getByTestId('apply-conditions-btn').click();
+    cy.getByTestId('header-add-conditions-btn').contains('2');
     cy.location('pathname').should('contain', '/integrations/');
 
     checkTableRow(
@@ -572,24 +633,96 @@ describe('Integrations List Page', function () {
         channel: 'Email',
         environment: 'Development',
         status: 'Disabled',
+        conditions: 1,
       },
       6
     );
   });
 
-  it('should update the mailjet integration', () => {
-    cy.intercept('GET', '*/integrations', async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }).as('getIntegrations');
-    cy.intercept('POST', '*/integrations', async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }).as('createIntegration');
-    cy.intercept('*/environments').as('getEnvironments');
+  it('should remove as primary when adding conditions', () => {
+    interceptIntegrationRequests();
 
-    cy.visit('/integrations');
+    cy.getByTestId('integrations-list-table')
+      .getByTestId('integration-name-cell')
+      .contains('SendGrid')
+      .getByTestId('integration-name-cell-primary')
+      .should('be.visible');
 
-    cy.wait('@getIntegrations');
-    cy.wait('@getEnvironments');
+    clickOnListRow('SendGrid');
+    cy.getByTestId('header-add-conditions-btn').click();
+
+    cy.getByTestId('remove-primary-flag-modal').should('be.visible');
+    cy.getByTestId('remove-primary-flag-modal').contains('Primary flag will be removed');
+    cy.getByTestId('remove-primary-flag-modal').contains(
+      'Adding conditions to the primary provider instance removes its primary status when a user applies changes by'
+    );
+    cy.getByTestId('remove-primary-flag-modal').find('button').contains('Cancel').should('be.visible');
+    cy.getByTestId('remove-primary-flag-modal').find('button').contains('Got it').should('be.visible').click();
+
+    cy.getByTestId('conditions-form-title').contains('Conditions for SendGrid provider instance');
+    cy.getByTestId('add-new-condition').click();
+    cy.getByTestId('conditions-form-on').should('have.value', 'Tenant');
+    cy.getByTestId('conditions-form-key').should('have.value', 'Identifier');
+    cy.getByTestId('conditions-form-operator').should('have.value', 'Equal');
+    cy.getByTestId('conditions-form-value').type('tenant123');
+
+    cy.getByTestId('apply-conditions-btn').click();
+    cy.getByTestId('provider-instance-name').first().clear().type('SendGrid test');
+
+    cy.getByTestId('from').type('info@novu.co');
+    cy.getByTestId('senderName').type('Novu');
+
+    cy.getByTestId('update-provider-sidebar-update').should('not.be.disabled').contains('Update').click();
+    cy.get('.mantine-Modal-modal button').contains('Make primary');
+
+    cy.get('.mantine-Modal-close').click();
+  });
+
+  it('should remove conditions when set to primary', () => {
+    interceptIntegrationRequests();
+
+    cy.getByTestId('add-provider').should('be.enabled').click();
+    cy.location('pathname').should('equal', '/integrations/create');
+    cy.getByTestId('select-provider-sidebar').should('be.visible');
+
+    cy.getByTestId(`provider-${EmailProviderIdEnum.Mailjet}`).contains('Mailjet').click();
+    cy.getByTestId('select-provider-sidebar-next').should('not.be.disabled').contains('Next').click();
+
+    cy.location('pathname').should('equal', '/integrations/create/email/mailjet');
+    cy.getByTestId('provider-instance-name').clear().type('Mailjet Integration');
+    cy.getByTestId('add-conditions-btn').click();
+    cy.getByTestId('conditions-form-title').contains('Conditions for Mailjet Integration provider instance');
+    cy.getByTestId('add-new-condition').click();
+
+    cy.getByTestId('conditions-form-value').type('tenant123');
+    cy.getByTestId('apply-conditions-btn').click();
+
+    cy.getByTestId('create-provider-instance-sidebar-create').should('not.be.disabled').contains('Create').click();
+
+    cy.wait('@createIntegration');
+
+    cy.getByTestId('update-provider-sidebar').should('be.visible');
+    cy.getByTestId('header-add-conditions-btn').contains('1');
+
+    cy.getByTestId('header-make-primary-btn').click();
+
+    cy.getByTestId('remove-conditions-modal').should('be.visible');
+    cy.getByTestId('remove-conditions-modal').contains('Conditions will be removed');
+    cy.getByTestId('remove-conditions-modal').contains('Marking this instance as primary will remove all conditions');
+    cy.getByTestId('remove-conditions-modal').find('button').contains('Cancel').should('be.visible');
+    cy.getByTestId('remove-conditions-modal').find('button').contains('Remove conditions').should('be.visible').click();
+
+    cy.getByTestId('header-make-primary-btn').should('not.exist');
+
+    cy.getByTestId('integrations-list-table')
+      .getByTestId('integration-name-cell')
+      .contains('Mailjet Integration')
+      .getByTestId('integration-name-cell-primary')
+      .should('be.visible');
+  });
+
+  it('should update the mailjet integration', () => {
+    interceptIntegrationRequests();
 
     cy.getByTestId('add-provider').should('be.enabled').click();
     cy.location('pathname').should('equal', '/integrations/create');
@@ -641,18 +774,7 @@ describe('Integrations List Page', function () {
   });
 
   it('should update the mailjet integration from the list', () => {
-    cy.intercept('GET', '*/integrations', async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }).as('getIntegrations');
-    cy.intercept('POST', '*/integrations', async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    }).as('createIntegration');
-    cy.intercept('*/environments').as('getEnvironments');
-
-    cy.visit('/integrations');
-
-    cy.wait('@getIntegrations');
-    cy.wait('@getEnvironments');
+    interceptIntegrationRequests();
 
     cy.getByTestId('add-provider').should('be.enabled').click();
     cy.location('pathname').should('equal', '/integrations/create');
diff --git a/apps/web/src/components/conditions/Conditions.tsx b/apps/web/src/components/conditions/Conditions.tsx
new file mode 100644
index 00000000000..65ad7d0ad46
--- /dev/null
+++ b/apps/web/src/components/conditions/Conditions.tsx
@@ -0,0 +1,314 @@
+import { Grid, Group, ActionIcon, Center, useMantineTheme } from '@mantine/core';
+import styled from '@emotion/styled';
+import { useMemo } from 'react';
+import { Control, Controller, useFieldArray, useForm, useWatch } from 'react-hook-form';
+
+import { FILTER_TO_LABEL, FilterPartTypeEnum } from '@novu/shared';
+
+import { Button, colors, Dropdown, Input, Select, Sidebar, Text, Title, Tooltip } from '../../design-system';
+import { ConditionPlus, DotsHorizontal, Duplicate, Trash, Condition, ErrorIcon } from '../../design-system/icons';
+import { When } from '../utils/When';
+import { ConditionsContextEnum, ConditionsContextFields, IConditions } from './types';
+
+interface IConditionsForm {
+  conditions: IConditions[];
+}
+export function Conditions({
+  isOpened,
+  conditions,
+  onClose,
+  setConditions,
+  name,
+  context = ConditionsContextEnum.INTEGRATIONS,
+}: {
+  isOpened: boolean;
+  onClose: () => void;
+  setConditions: (data: IConditions[]) => void;
+  conditions?: IConditions[];
+  name: string;
+  context?: ConditionsContextEnum;
+}) {
+  const { colorScheme } = useMantineTheme();
+
+  const {
+    control,
+    getValues,
+    trigger,
+    formState: { errors, isValid, isDirty },
+  } = useForm<IConditionsForm>({
+    defaultValues: { conditions },
+    mode: 'onChange',
+  });
+
+  const { fields, append, remove, insert } = useFieldArray({
+    control,
+    name: `conditions.0.children`,
+  });
+
+  const { label, filterPartsList } = ConditionsContextFields[context];
+
+  const FilterPartTypeList = useMemo(() => {
+    return filterPartsList.map((filterType) => {
+      return {
+        value: filterType,
+        label: FILTER_TO_LABEL[filterType],
+      };
+    });
+  }, [context]);
+
+  function handleDuplicate(index: number) {
+    insert(index + 1, getValues(`conditions.0.children.${index}`));
+  }
+
+  function handleDelete(index: number) {
+    remove(index);
+  }
+
+  const onApplyConditions = async () => {
+    await trigger('conditions');
+    if (!errors.conditions) {
+      updateConditions(getValues('conditions'));
+    }
+  };
+
+  function updateConditions(data) {
+    setConditions(data);
+    onClose();
+  }
+
+  return (
+    <Sidebar
+      isOpened={isOpened}
+      onClose={onClose}
+      isExpanded
+      customHeader={
+        <Center inline>
+          <Condition color={colorScheme === 'dark' ? colors.white : colors.B30} />
+          <Title ml={8} size={2} data-test-id="conditions-form-title">
+            Conditions for {name} {label}
+          </Title>
+        </Center>
+      }
+      customFooter={
+        <Group ml="auto">
+          <Button variant="outline" onClick={onClose} data-test-id="conditions-form-cancel-btn">
+            Cancel
+          </Button>
+          <Tooltip position="top" error disabled={isValid} label={'Some conditions are missing values'}>
+            <div>
+              <Button
+                disabled={!isDirty || (conditions?.length === 0 && fields?.length === 0)}
+                onClick={onApplyConditions}
+                data-test-id="apply-conditions-btn"
+              >
+                Apply conditions
+              </Button>
+            </div>
+          </Tooltip>
+        </Group>
+      }
+    >
+      {fields.map((item, index) => {
+        return (
+          <div data-test-id="conditions-form-item" key={item.id}>
+            <Grid columns={20} align="center" gutter="xs">
+              <Grid.Col span={2}>
+                {index > 0 ? (
+                  <Wrapper>
+                    <Controller
+                      control={control}
+                      name={`conditions.0.value`}
+                      defaultValue="AND"
+                      render={({ field }) => {
+                        return (
+                          <Select
+                            data={[
+                              { value: 'AND', label: 'And' },
+                              { value: 'OR', label: 'Or' },
+                            ]}
+                            {...field}
+                            data-test-id="conditions-form-value-dropdown"
+                          />
+                        );
+                      }}
+                    />
+                  </Wrapper>
+                ) : (
+                  <Text ml={14} color={colors.B60}>
+                    When
+                  </Text>
+                )}
+              </Grid.Col>
+              <Grid.Col span={3}>
+                <Controller
+                  control={control}
+                  name={`conditions.0.children.${index}.on`}
+                  defaultValue={FilterPartTypeEnum.TENANT}
+                  render={({ field }) => {
+                    return (
+                      <Select placeholder="On" data={FilterPartTypeList} {...field} data-test-id="conditions-form-on" />
+                    );
+                  }}
+                />
+              </Grid.Col>
+              <EqualityForm control={control} index={index} />
+              <Grid.Col span={1}>
+                <Dropdown
+                  withArrow={false}
+                  offset={0}
+                  control={
+                    <ActionIcon data-test-id="conditions-row-btn" variant={'transparent'}>
+                      <DotsHorizontal color={colors.B60} />
+                    </ActionIcon>
+                  }
+                  middlewares={{ flip: false, shift: false }}
+                  position="bottom-end"
+                >
+                  <Dropdown.Item
+                    data-test-id="conditions-row-duplicate"
+                    onClick={() => handleDuplicate(index)}
+                    icon={<Duplicate />}
+                  >
+                    Duplicate
+                  </Dropdown.Item>
+                  <Dropdown.Item
+                    data-test-id="conditions-row-delete"
+                    onClick={() => handleDelete(index)}
+                    icon={<Trash />}
+                  >
+                    Delete
+                  </Dropdown.Item>
+                </Dropdown>
+              </Grid.Col>
+            </Grid>
+          </div>
+        );
+      })}
+
+      <Group position="left">
+        <Button
+          variant="outline"
+          onClick={() => {
+            append({
+              operator: 'EQUAL',
+              on: FilterPartTypeEnum.TENANT,
+              field: 'identifier',
+              value: '',
+            });
+          }}
+          icon={<ConditionPlus />}
+          data-test-id="add-new-condition"
+        >
+          Add condition
+        </Button>
+      </Group>
+    </Sidebar>
+  );
+}
+
+function EqualityForm({ control, index }: { control: Control<IConditionsForm>; index: number }) {
+  const operator = useWatch({
+    control,
+    name: `conditions.0.children.${index}.operator`,
+  });
+
+  return (
+    <>
+      <Grid.Col span={5}>
+        <Controller
+          control={control}
+          name={`conditions.0.children.${index}.field`}
+          defaultValue="identifier"
+          render={({ field }) => {
+            return (
+              <Select
+                placeholder="Key"
+                data={[
+                  { value: 'name', label: 'Name' },
+                  { value: 'identifier', label: 'Identifier' },
+                ]}
+                {...field}
+                data-test-id="conditions-form-key"
+              />
+            );
+          }}
+        />
+      </Grid.Col>
+      <Grid.Col span={3}>
+        <Controller
+          control={control}
+          name={`conditions.0.children.${index}.operator`}
+          defaultValue="EQUAL"
+          render={({ field }) => {
+            return (
+              <Select
+                placeholder="Operator"
+                data={[
+                  { value: 'EQUAL', label: 'Equal' },
+                  { value: 'NOT_EQUAL', label: 'Does not equal' },
+                  { value: 'IN', label: 'Contains' },
+                  { value: 'NOT_IN', label: 'Does not contain' },
+                  { value: 'IS_DEFINED', label: 'Is defined' },
+                ]}
+                {...field}
+                data-test-id="conditions-form-operator"
+              />
+            );
+          }}
+        />
+      </Grid.Col>
+
+      <Grid.Col span={6}>
+        {operator !== 'IS_DEFINED' && (
+          <Controller
+            control={control}
+            name={`conditions.0.children.${index}.value`}
+            defaultValue=""
+            rules={{ required: true }}
+            render={({ field, fieldState }) => {
+              return (
+                <Input
+                  {...field}
+                  value={field.value as string}
+                  rightSection={
+                    <When truthy={!!fieldState.error}>
+                      <Tooltip
+                        opened
+                        data-test-id="conditions-form-tooltip-error"
+                        error
+                        position="top"
+                        offset={15}
+                        label={'Value is missing'}
+                      >
+                        <span>
+                          <ErrorIcon data-test-id="conditions-form-value-error" color={colors.error} />
+                        </span>
+                      </Tooltip>
+                    </When>
+                  }
+                  error={!!fieldState.error}
+                  placeholder="Value"
+                  data-test-id="conditions-form-value"
+                />
+              );
+            }}
+          />
+        )}
+      </Grid.Col>
+    </>
+  );
+}
+
+const Wrapper = styled.div`
+  .mantine-Select-wrapper:not(:hover) {
+    .mantine-Select-input {
+      border-color: transparent;
+      color: ${colors.B60};
+    }
+    .mantine-Input-rightSection.mantine-Select-rightSection {
+      svg {
+        display: none;
+      }
+    }
+  }
+`;
diff --git a/apps/web/src/components/conditions/index.ts b/apps/web/src/components/conditions/index.ts
new file mode 100644
index 00000000000..a4dfe570c58
--- /dev/null
+++ b/apps/web/src/components/conditions/index.ts
@@ -0,0 +1,2 @@
+export * from './Conditions';
+export * from './types';
diff --git a/apps/web/src/components/conditions/types.ts b/apps/web/src/components/conditions/types.ts
new file mode 100644
index 00000000000..fc8556e2ed5
--- /dev/null
+++ b/apps/web/src/components/conditions/types.ts
@@ -0,0 +1,19 @@
+import { BuilderFieldType, BuilderGroupValues, FilterParts, FilterPartTypeEnum } from '@novu/shared';
+
+export interface IConditions {
+  isNegated?: boolean;
+  type?: BuilderFieldType;
+  value?: BuilderGroupValues;
+  children?: FilterParts[];
+}
+
+export enum ConditionsContextEnum {
+  INTEGRATIONS = 'INTEGRATIONS',
+}
+
+export const ConditionsContextFields = {
+  [ConditionsContextEnum.INTEGRATIONS]: {
+    label: 'provider instance',
+    filterPartsList: [FilterPartTypeEnum.TENANT],
+  },
+};
diff --git a/apps/web/src/components/execution-detail/ExecutionDetailsConditionItem.cy.tsx b/apps/web/src/components/execution-detail/ExecutionDetailsConditionItem.cy.tsx
index c47f61b64c2..5a6e0009e9f 100644
--- a/apps/web/src/components/execution-detail/ExecutionDetailsConditionItem.cy.tsx
+++ b/apps/web/src/components/execution-detail/ExecutionDetailsConditionItem.cy.tsx
@@ -12,7 +12,7 @@ const condition: ICondition = {
 };
 
 describe('Execution Details Condition Component', function () {
-  it('should render ExecutionDetailsCondtions properly', function () {
+  it('should render ExecutionDetailsConditions properly', function () {
     cy.mount(
       <TestWrapper>
         <ExecutionDetailsConditionItem condition={condition} />
diff --git a/apps/web/src/components/execution-detail/ExecutionDetailsConditions.cy.tsx b/apps/web/src/components/execution-detail/ExecutionDetailsConditions.cy.tsx
index d6cdc2c55b6..dab60f4c9d5 100644
--- a/apps/web/src/components/execution-detail/ExecutionDetailsConditions.cy.tsx
+++ b/apps/web/src/components/execution-detail/ExecutionDetailsConditions.cy.tsx
@@ -39,7 +39,7 @@ const conditions: ICondition[] = [
 ];
 
 describe('Execution Details Condition Component', function () {
-  it('should render ExecutionDetailsCondtions properly', function () {
+  it('should render ExecutionDetailsConditions properly', function () {
     cy.mount(
       <TestWrapper>
         <ExecutionDetailsConditions conditions={conditions} />
diff --git a/apps/web/src/design-system/icons/actions/ConditionPlus.tsx b/apps/web/src/design-system/icons/actions/ConditionPlus.tsx
new file mode 100644
index 00000000000..1877a995c0b
--- /dev/null
+++ b/apps/web/src/design-system/icons/actions/ConditionPlus.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+export function ConditionPlus(props: React.ComponentPropsWithoutRef<'svg'>) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none" {...props}>
+      <mask
+        id="mask0_3918_57495"
+        style={{ maskType: 'alpha' }}
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="16"
+        height="16"
+      >
+        <rect width="16" height="16" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_3918_57495)">
+        <path
+          d="M6.66667 12V10.6667H9V12H6.66667ZM4 8.66667V7.33333H11V8.66667H4ZM2 5.33333V4H14V5.33333H2Z"
+          fill="currentColor"
+        />
+        <path
+          d="M12.5 11.8333V13.8333H13.8333V11.8333H15.8333V10.5H13.8333V8.5H12.5V10.5H10.5V11.8333H12.5Z"
+          fill="currentColor"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/src/design-system/icons/actions/Duplicate.tsx b/apps/web/src/design-system/icons/actions/Duplicate.tsx
new file mode 100644
index 00000000000..10eee70d2ca
--- /dev/null
+++ b/apps/web/src/design-system/icons/actions/Duplicate.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+/* eslint-disable */
+export function Duplicate(props: React.ComponentPropsWithoutRef<'svg'>) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none" {...props}>
+      <path
+        d="M10.6562 11.75H11.9688V9.34375H14.375V8.03125H11.9688V5.625H10.6562V8.03125H8.25V9.34375H10.6562V11.75ZM6.9375 14.375C6.57656 14.375 6.26758 14.2465 6.01055 13.9895C5.75352 13.7324 5.625 13.4234 5.625 13.0625V4.3125C5.625 3.95156 5.75352 3.64258 6.01055 3.38555C6.26758 3.12852 6.57656 3 6.9375 3H15.6875C16.0484 3 16.3574 3.12852 16.6145 3.38555C16.8715 3.64258 17 3.95156 17 4.3125V13.0625C17 13.4234 16.8715 13.7324 16.6145 13.9895C16.3574 14.2465 16.0484 14.375 15.6875 14.375H6.9375ZM6.9375 13.0625H15.6875V4.3125H6.9375V13.0625ZM4.3125 17C3.95156 17 3.64258 16.8715 3.38555 16.6145C3.12852 16.3574 3 16.0484 3 15.6875V5.625H4.3125V15.6875H14.375V17H4.3125Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/apps/web/src/design-system/icons/actions/PlusFilled.tsx b/apps/web/src/design-system/icons/actions/PlusFilled.tsx
index 6087e41ca02..8c1eac0e7ea 100644
--- a/apps/web/src/design-system/icons/actions/PlusFilled.tsx
+++ b/apps/web/src/design-system/icons/actions/PlusFilled.tsx
@@ -7,14 +7,14 @@ export function PlusFilled(props: React.ComponentPropsWithoutRef<'svg'>) {
       <path
         d="M7.19995 12H16.8M12 7.20001V16.8"
         stroke="white"
-        stroke-width="2"
-        stroke-linecap="round"
-        stroke-linejoin="round"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
       />
       <defs>
         <linearGradient id="paint0_linear_375_800" x1="0" y1="12" x2="24" y2="12" gradientUnits="userSpaceOnUse">
-          <stop stop-color="#DD2476" />
-          <stop offset="1" stop-color="#FF512F" />
+          <stop stopColor="#DD2476" />
+          <stop offset="1" stopColor="#FF512F" />
         </linearGradient>
       </defs>
     </svg>
diff --git a/apps/web/src/design-system/icons/general/Condition.tsx b/apps/web/src/design-system/icons/general/Condition.tsx
new file mode 100644
index 00000000000..cfa890652db
--- /dev/null
+++ b/apps/web/src/design-system/icons/general/Condition.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+
+export function Condition(props: React.ComponentPropsWithoutRef<'svg'>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      color="#828299"
+      {...props}
+    >
+      <g id="Icon filter" clipPath="url(#clip0_5047_8523)">
+        <g id="filter_list">
+          <mask id="mask0_5047_8523" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16">
+            <rect id="Bounding box" width="16" height="16" fill="#D9D9D9" />
+          </mask>
+          <g mask="url(#mask0_5047_8523)">
+            <path
+              id="filter_list_2"
+              d="M6.66667 12V10.6667H9.33333V12H6.66667ZM4 8.66667V7.33333H12V8.66667H4ZM2 5.33333V4H14V5.33333H2Z"
+              fill="currentColor"
+            />
+          </g>
+        </g>
+      </g>
+      <defs>
+        <clipPath id="clip0_5047_8523">
+          <rect width="16" height="16" fill="currentColor" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
diff --git a/apps/web/src/design-system/icons/general/RemoveCondition.tsx b/apps/web/src/design-system/icons/general/RemoveCondition.tsx
new file mode 100644
index 00000000000..8c61a4abe27
--- /dev/null
+++ b/apps/web/src/design-system/icons/general/RemoveCondition.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+/* eslint-disable */
+export function RemoveCondition(props: React.ComponentPropsWithoutRef<'svg'>) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" fill="none" {...props}>
+      <path
+        d="M13.1807 14.0829L0.914062 1.81621L1.86406 0.866211L14.1307 13.1329L13.1807 14.0829ZM10.5474 7.66621L9.21406 6.33288H11.9974V7.66621H10.5474ZM7.21406 4.33288L5.88073 2.99954H13.9974V4.33288H7.21406ZM6.66406 10.9995V9.66621H9.33073V10.9995H6.66406ZM3.9974 7.66621V6.33288H6.76406V7.66621H3.9974ZM1.9974 4.33288V2.99954H3.43073V4.33288H1.9974Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/apps/web/src/design-system/icons/general/StarEmpty.tsx b/apps/web/src/design-system/icons/general/StarEmpty.tsx
index c0a3d3b062f..b64ae38ae9d 100644
--- a/apps/web/src/design-system/icons/general/StarEmpty.tsx
+++ b/apps/web/src/design-system/icons/general/StarEmpty.tsx
@@ -4,7 +4,7 @@ export const StarEmpty = (props: React.ComponentPropsWithoutRef<'svg'>) => {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 13" width={18} height={18} {...props}>
       <path
-        fill="#fff"
+        fill="currentColor"
         d="M4.9 9.883 7 8.617 9.1 9.9l-.55-2.4 1.85-1.6-2.433-.217-.966-2.266-.967 2.25-2.433.216L5.45 7.5 4.9 9.883Zm-2.016 2.784 1.083-4.684-3.633-3.15 4.8-.416L7.001 0l1.866 4.417 4.8.416-3.633 3.15 1.083 4.684-4.116-2.484-4.117 2.484Z"
       />
     </svg>
diff --git a/apps/web/src/design-system/icons/general/Warning.tsx b/apps/web/src/design-system/icons/general/Warning.tsx
new file mode 100644
index 00000000000..5fa4fa4c0a4
--- /dev/null
+++ b/apps/web/src/design-system/icons/general/Warning.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+/* eslint-disable */
+export function Warning(props: React.ComponentPropsWithoutRef<'svg'>) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="22" height="19" viewBox="0 0 22 19" fill="none" {...props}>
+      <path
+        d="M0 19L11 0L22 19H0ZM3.45 17H18.55L11 4L3.45 17ZM11 16C11.2833 16 11.5208 15.9042 11.7125 15.7125C11.9042 15.5208 12 15.2833 12 15C12 14.7167 11.9042 14.4792 11.7125 14.2875C11.5208 14.0958 11.2833 14 11 14C10.7167 14 10.4792 14.0958 10.2875 14.2875C10.0958 14.4792 10 14.7167 10 15C10 15.2833 10.0958 15.5208 10.2875 15.7125C10.4792 15.9042 10.7167 16 11 16ZM10 13H12V8H10V13Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/apps/web/src/design-system/icons/index.ts b/apps/web/src/design-system/icons/index.ts
index 28dd35feee6..d781a96e70b 100644
--- a/apps/web/src/design-system/icons/index.ts
+++ b/apps/web/src/design-system/icons/index.ts
@@ -81,6 +81,9 @@ export { Translate } from './general/Translate';
 export { UserAccess } from './general/UserAccess';
 export { SSO } from './general/SSO';
 export { Cloud } from './general/Cloud';
+export { Condition } from './general/Condition';
+export { RemoveCondition } from './general/RemoveCondition';
+export { Warning } from './general/Warning';
 
 export { Copy } from './actions/Copy';
 export { Close } from './actions/Close';
@@ -93,6 +96,8 @@ export { Edit } from './actions/Edit';
 export { Upload } from './actions/Upload';
 export { Invite } from './actions/Invite';
 export { PlusFilled } from './actions/PlusFilled';
+export { ConditionPlus } from './actions/ConditionPlus';
+export { Duplicate } from './actions/Duplicate';
 
 export { ArrowDown } from './arrows/ArrowDown';
 export { DoubleArrowRight } from './arrows/DoubleArrowRight';
diff --git a/apps/web/src/design-system/sidebar/Sidebar.tsx b/apps/web/src/design-system/sidebar/Sidebar.tsx
index 59508b2f91f..274fc147e2c 100644
--- a/apps/web/src/design-system/sidebar/Sidebar.tsx
+++ b/apps/web/src/design-system/sidebar/Sidebar.tsx
@@ -124,9 +124,9 @@ export const Sidebar = ({
       trapFocus={false}
       data-expanded={isExpanded}
     >
-      <Form noValidate onSubmit={onSubmit} data-test-id={dataTestId}>
+      <Form name="form-name" noValidate onSubmit={onSubmit} data-test-id={dataTestId}>
         <HeaderHolder>
-          {isExpanded && (
+          {isExpanded && onBack && (
             <ActionIcon variant="transparent" onClick={onBack} data-test-id="sidebar-back">
               <ArrowLeft color={colors.B40} />
             </ActionIcon>
diff --git a/apps/web/src/design-system/tooltip/Tooltip.styles.ts b/apps/web/src/design-system/tooltip/Tooltip.styles.ts
index aab5ac085da..ed0bd07b040 100644
--- a/apps/web/src/design-system/tooltip/Tooltip.styles.ts
+++ b/apps/web/src/design-system/tooltip/Tooltip.styles.ts
@@ -1,20 +1,27 @@
 import { createStyles, MantineTheme } from '@mantine/core';
 import { colors, shadows } from '../config';
+import { getGradient } from '../config/helper';
 
-export default createStyles((theme: MantineTheme) => {
+export default createStyles((theme: MantineTheme, { error }: { error: boolean }) => {
   const dark = theme.colorScheme === 'dark';
+  const opacityErrorColor = theme.fn.rgba(colors.error, 0.2);
+  const errorGradient = getGradient(opacityErrorColor);
+  const backgroundErrorColor = dark ? colors.B17 : colors.white;
+  const backgroundColor = dark ? colors.B20 : colors.white;
+  const background = error ? `${errorGradient}, ${backgroundErrorColor}` : backgroundColor;
+  const color = error ? colors.error : colors.B60;
 
   return {
     tooltip: {
-      backgroundColor: dark ? colors.B20 : theme.white,
-      color: colors.B60,
+      background,
+      color,
       boxShadow: dark ? shadows.dark : shadows.medium,
       padding: '12px 15px',
       fontSize: '14px',
       fontWeight: 400,
     },
     arrow: {
-      backgroundColor: dark ? colors.B20 : theme.white,
+      background,
     },
   };
 });
diff --git a/apps/web/src/design-system/tooltip/Tooltip.tsx b/apps/web/src/design-system/tooltip/Tooltip.tsx
index bd268add1d6..53d854a1c26 100644
--- a/apps/web/src/design-system/tooltip/Tooltip.tsx
+++ b/apps/web/src/design-system/tooltip/Tooltip.tsx
@@ -2,30 +2,29 @@ import { Tooltip as MantineTooltip, TooltipProps } from '@mantine/core';
 
 import useStyles from './Tooltip.styles';
 
+interface ITooltipProps
+  extends Pick<
+    TooltipProps,
+    | 'multiline'
+    | 'width'
+    | 'label'
+    | 'opened'
+    | 'position'
+    | 'disabled'
+    | 'children'
+    | 'sx'
+    | 'withinPortal'
+    | 'offset'
+    | 'classNames'
+  > {
+  error?: boolean;
+}
 /**
  * Tooltip component
  *
  */
-export function Tooltip({
-  children,
-  label,
-  opened = undefined,
-  ...props
-}: Pick<
-  TooltipProps,
-  | 'multiline'
-  | 'width'
-  | 'label'
-  | 'opened'
-  | 'position'
-  | 'disabled'
-  | 'children'
-  | 'sx'
-  | 'withinPortal'
-  | 'offset'
-  | 'classNames'
->) {
-  const { classes } = useStyles();
+export function Tooltip({ children, label, opened = undefined, error = false, ...props }: ITooltipProps) {
+  const { classes } = useStyles({ error });
 
   return (
     <MantineTooltip
diff --git a/apps/web/src/design-system/typography/title/Title.tsx b/apps/web/src/design-system/typography/title/Title.tsx
index 23383af3a2e..284ac551161 100644
--- a/apps/web/src/design-system/typography/title/Title.tsx
+++ b/apps/web/src/design-system/typography/title/Title.tsx
@@ -1,23 +1,31 @@
-import { Title as MantineTitle } from '@mantine/core';
+import { MantineColor, Title as MantineTitle, useMantineTheme } from '@mantine/core';
 import { colors } from '../../config';
 import { SpacingProps } from '../../shared/spacing.props';
 
 interface ITitleProps extends JSX.ElementChildrenAttribute, SpacingProps {
   size?: 1 | 2;
+  color?: MantineColor;
 }
 /**
  * Use Title to create headers.
  *
  */
-export function Title({ size = 1, children, ...rest }: ITitleProps) {
+export function Title({ size = 1, children, ...props }: ITitleProps) {
+  const { colorScheme } = useMantineTheme();
+
+  let textColor = props.color;
+  if (!textColor) {
+    textColor = colorScheme === 'dark' ? colors.white : colors.B40;
+  }
+
   return (
     <MantineTitle
-      sx={(theme) => ({
+      sx={{
         fontWeight: size === 1 ? 800 : 700,
-        color: theme.colorScheme === 'dark' ? colors.white : colors.B40,
-      })}
+      }}
       order={size}
-      {...rest}
+      color={textColor}
+      {...props}
     >
       {children}
     </MantineTitle>
diff --git a/apps/web/src/pages/integrations/IntegrationsList.tsx b/apps/web/src/pages/integrations/IntegrationsList.tsx
index 721ce176bd1..daff3f5f1ac 100644
--- a/apps/web/src/pages/integrations/IntegrationsList.tsx
+++ b/apps/web/src/pages/integrations/IntegrationsList.tsx
@@ -18,6 +18,7 @@ import { IntegrationStatusCell } from './components/IntegrationStatusCell';
 import { When } from '../../components/utils/When';
 import { IntegrationsListNoData } from './components/IntegrationsListNoData';
 import { mapToTableIntegration } from './utils';
+import { ConditionCell } from './components/ConditionCell';
 
 const columns: IExtendedColumn<ITableIntegration>[] = [
   {
@@ -49,6 +50,13 @@ const columns: IExtendedColumn<ITableIntegration>[] = [
     Header: 'Environment',
     Cell: IntegrationEnvironmentCell,
   },
+  {
+    accessor: 'conditions',
+    Header: 'Condition',
+    width: 100,
+    maxWidth: 100,
+    Cell: ConditionCell,
+  },
   {
     accessor: 'active',
     Header: 'Status',
diff --git a/apps/web/src/pages/integrations/components/ConditionCell.tsx b/apps/web/src/pages/integrations/components/ConditionCell.tsx
new file mode 100644
index 00000000000..eabd3fc969f
--- /dev/null
+++ b/apps/web/src/pages/integrations/components/ConditionCell.tsx
@@ -0,0 +1,42 @@
+import { Group, useMantineColorScheme } from '@mantine/core';
+import { colors, IExtendedCellProps, withCellLoading } from '../../../design-system';
+import { Condition } from '../../../design-system/icons';
+import type { ITableIntegration } from '../types';
+
+const ConditionCellBase = ({ row: { original } }: IExtendedCellProps<ITableIntegration>) => {
+  const { colorScheme } = useMantineColorScheme();
+
+  if (!original.conditions || original.conditions.length < 1) {
+    return (
+      <div
+        data-test-id="integration-conditions-cell"
+        style={{
+          color: colorScheme === 'dark' ? colors.B40 : colors.B80,
+        }}
+      >
+        -
+      </div>
+    );
+  }
+
+  return (
+    <Group
+      data-test-id="integration-conditions-cell"
+      style={{
+        padding: '4px 8px',
+        textAlign: 'center',
+        borderRadius: '60px',
+        background: colorScheme === 'dark' ? colors.B30 : colors.B85,
+        width: '43px',
+      }}
+      spacing={4}
+    >
+      <Condition />
+      <div style={{ color: colorScheme === 'dark' ? colors.B80 : colors.B40 }}>
+        {original.conditions?.[0]?.children?.length}
+      </div>
+    </Group>
+  );
+};
+
+export const ConditionCell = withCellLoading(ConditionCellBase);
diff --git a/apps/web/src/pages/integrations/components/ConditionIconButton.tsx b/apps/web/src/pages/integrations/components/ConditionIconButton.tsx
new file mode 100644
index 00000000000..2444756a267
--- /dev/null
+++ b/apps/web/src/pages/integrations/components/ConditionIconButton.tsx
@@ -0,0 +1,122 @@
+import { useState } from 'react';
+import styled from '@emotion/styled';
+import { Group, ActionIcon, Center } from '@mantine/core';
+import { When } from '../../../components/utils/When';
+import { colors, Tooltip, Text, Modal, Button, Title } from '../../../design-system';
+import { Condition, ConditionPlus, Warning } from '../../../design-system/icons';
+
+const IconButton = styled(Group)`
+  text-align: center;
+  border-radius: 8px;
+  width: 32px;
+  height: 32px;
+  color: ${({ theme }) => (theme.colorScheme === 'dark' ? colors.B60 : colors.B30)};
+
+  &:hover {
+    background: ${({ theme }) => (theme.colorScheme === 'dark' ? colors.B30 : colors.B85)};
+    color: ${({ theme }) => (theme.colorScheme === 'dark' ? colors.white : colors.B30)};
+  }
+`;
+
+const RemovesPrimary = () => {
+  return (
+    <Text mt={4} color="#EAA900">
+      This action replaces the
+      <br />
+      primary provider flag
+    </Text>
+  );
+};
+
+export const ConditionIconButton = ({
+  conditions = 0,
+  primary = false,
+  onClick,
+}: {
+  conditions?: number;
+  primary?: boolean;
+  onClick: () => void;
+}) => {
+  const [modalOpen, setModalOpen] = useState(false);
+
+  return (
+    <>
+      <Tooltip
+        label={
+          <>
+            {conditions > 0 ? 'Edit' : 'Add'} Conditions
+            <When truthy={primary}>
+              <RemovesPrimary />
+            </When>
+          </>
+        }
+        position="bottom"
+      >
+        <ActionIcon
+          data-test-id="header-add-conditions-btn"
+          onClick={() => {
+            if (primary && conditions === 0) {
+              setModalOpen(true);
+
+              return;
+            }
+            onClick();
+          }}
+          variant="transparent"
+        >
+          <IconButton position="center" spacing={4}>
+            <When truthy={conditions === 0}>
+              <ConditionPlus />
+            </When>
+            <When truthy={conditions > 0}>
+              <Center inline>
+                <Condition />
+                <div>{conditions}</div>
+              </Center>
+            </When>
+          </IconButton>
+        </ActionIcon>
+      </Tooltip>
+      <Modal
+        opened={modalOpen}
+        data-test-id="remove-primary-flag-modal"
+        title={
+          <Group spacing={8}>
+            <Warning color="#EAA900" />
+            <Title size={2} color="#EAA900">
+              Primary flag will be removed
+            </Title>
+          </Group>
+        }
+        size="lg"
+        onClose={() => {
+          setModalOpen(false);
+        }}
+      >
+        <Text color={colors.B60}>
+          Adding conditions to the primary provider instance removes its primary status when a user applies changes by
+          clicking the Update button. This can potentially cause notification failures for the steps that were using the
+          primary provider.
+        </Text>
+        <Group mt={30} position="right">
+          <Button
+            variant="outline"
+            onClick={() => {
+              setModalOpen(false);
+            }}
+          >
+            Cancel
+          </Button>
+          <Button
+            onClick={() => {
+              onClick();
+              setModalOpen(false);
+            }}
+          >
+            <Group spacing={8}>Got it</Group>
+          </Button>
+        </Group>
+      </Modal>
+    </>
+  );
+};
diff --git a/apps/web/src/pages/integrations/components/IntegrationNameCell.tsx b/apps/web/src/pages/integrations/components/IntegrationNameCell.tsx
index e0b65da5227..14dafb26ede 100644
--- a/apps/web/src/pages/integrations/components/IntegrationNameCell.tsx
+++ b/apps/web/src/pages/integrations/components/IntegrationNameCell.tsx
@@ -93,7 +93,7 @@ export const IntegrationNameCell = ({ row: { original }, isLoading }: IExtendedC
         target={
           <IconHolder onMouseEnter={() => setPopoverOpened(true)} onMouseLeave={() => setPopoverOpened(false)}>
             <Image src={original.logoFileName[`${colorScheme}`]} alt={original.name} />
-            {original.primary && <Star />}
+            {original.primary && <Star data-test-id="integration-name-cell-primary" />}
           </IconHolder>
         }
       />
diff --git a/apps/web/src/pages/integrations/components/PrimaryIconButton.tsx b/apps/web/src/pages/integrations/components/PrimaryIconButton.tsx
new file mode 100644
index 00000000000..250807840a7
--- /dev/null
+++ b/apps/web/src/pages/integrations/components/PrimaryIconButton.tsx
@@ -0,0 +1,116 @@
+import styled from '@emotion/styled';
+import { Group, ActionIcon, Text } from '@mantine/core';
+import { useState } from 'react';
+import { When } from '../../../components/utils/When';
+import { Tooltip, Button, colors, Modal, Title } from '../../../design-system';
+import { RemoveCondition, StarEmpty, Warning } from '../../../design-system/icons';
+
+const IconButton = styled(Group)`
+  text-align: center;
+  border-radius: 8px;
+  width: 32px;
+  height: 32px;
+  color: ${({ theme }) => (theme.colorScheme === 'dark' ? colors.B60 : colors.B30)};
+
+  &:hover {
+    background: ${({ theme }) => (theme.colorScheme === 'dark' ? colors.B30 : colors.B85)};
+    color: ${({ theme }) => (theme.colorScheme === 'dark' ? colors.white : colors.B30)};
+  }
+`;
+
+const RemovesCondition = () => {
+  return (
+    <Text mt={4} lineClamp={3} color="#EAA900">
+      This action remove
+      <br /> applied conditions
+    </Text>
+  );
+};
+
+export const PrimaryIconButton = ({
+  conditions = 0,
+  primary = false,
+  onClick,
+}: {
+  conditions?: number;
+  primary?: boolean;
+  onClick: () => void;
+}) => {
+  const [modalOpen, setModalOpen] = useState(false);
+
+  if (primary) {
+    return null;
+  }
+
+  return (
+    <>
+      <Tooltip
+        label={
+          <>
+            Mark as Primary
+            <When truthy={conditions > 0}>
+              <RemovesCondition />
+            </When>
+          </>
+        }
+        position="bottom"
+      >
+        <ActionIcon
+          data-test-id="header-make-primary-btn"
+          onClick={() => {
+            if (conditions > 0) {
+              setModalOpen(true);
+
+              return;
+            }
+            onClick();
+          }}
+          variant="transparent"
+        >
+          <IconButton position="center" spacing={4}>
+            <StarEmpty />
+          </IconButton>
+        </ActionIcon>
+      </Tooltip>
+      <Modal
+        data-test-id="remove-conditions-modal"
+        opened={modalOpen}
+        title={
+          <Group spacing={8}>
+            <Warning color="#EAA900" />
+            <Title color="#EAA900">Conditions will be removed</Title>
+          </Group>
+        }
+        size="lg"
+        onClose={() => {
+          setModalOpen(false);
+        }}
+      >
+        <Text color={colors.B60}>
+          Marking this instance as primary will remove all conditions since primary instances can not have any
+          conditions.
+        </Text>
+        <Group mt={30} position="right">
+          <Button
+            variant="outline"
+            onClick={() => {
+              setModalOpen(false);
+            }}
+          >
+            Cancel
+          </Button>
+          <Button
+            onClick={() => {
+              onClick();
+              setModalOpen(false);
+            }}
+          >
+            <Group spacing={8}>
+              <RemoveCondition /> Remove conditions
+            </Group>
+          </Button>
+        </Group>
+      </Modal>
+    </>
+  );
+};
diff --git a/apps/web/src/pages/integrations/components/UpdateIntegrationSidebarHeader.tsx b/apps/web/src/pages/integrations/components/UpdateIntegrationSidebarHeader.tsx
index e676f506b60..bf50ae76243 100644
--- a/apps/web/src/pages/integrations/components/UpdateIntegrationSidebarHeader.tsx
+++ b/apps/web/src/pages/integrations/components/UpdateIntegrationSidebarHeader.tsx
@@ -1,12 +1,12 @@
 import { ReactNode, useMemo, useState } from 'react';
-import { Group } from '@mantine/core';
-import { Controller, useFormContext } from 'react-hook-form';
+import { Group, useMantineTheme } from '@mantine/core';
+import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import { CHANNELS_WITH_PRIMARY } from '@novu/shared';
 
 import { Button, colors, Dropdown, Modal, NameInput, Text, Title } from '../../../design-system';
 import { useFetchEnvironments } from '../../../hooks/useFetchEnvironments';
 import { ProviderImage } from './multi-provider/SelectProviderSidebar';
-import type { IIntegratedProvider } from '../types';
+import type { IIntegratedProvider, IntegrationEntity } from '../types';
 import { useProviders } from '../useProviders';
 import { useDeleteIntegration } from '../../../api/hooks';
 import { errorMessage, successMessage } from '../../../utils/notifications';
@@ -14,23 +14,37 @@ import { DotsHorizontal, StarEmpty, Trash } from '../../../design-system/icons';
 import { ProviderInfo } from './multi-provider/ProviderInfo';
 import { useSelectPrimaryIntegrationModal } from './multi-provider/useSelectPrimaryIntegrationModal';
 import { useMakePrimaryIntegration } from '../../../api/hooks/useMakePrimaryIntegration';
+import { ConditionIconButton } from './ConditionIconButton';
+import { PrimaryIconButton } from './PrimaryIconButton';
 
 export const UpdateIntegrationSidebarHeader = ({
   provider,
   onSuccessDelete,
   children = null,
+  openConditions,
 }: {
   provider: IIntegratedProvider | null;
   onSuccessDelete: () => void;
   children?: ReactNode | null;
+  openConditions: () => void;
 }) => {
   const [isModalOpened, setModalIsOpened] = useState(false);
   const { control } = useFormContext();
   const { environments } = useFetchEnvironments();
+  const { colorScheme } = useMantineTheme();
   const { providers, isLoading } = useProviders();
   const canMarkAsPrimary = provider && !provider.primary && CHANNELS_WITH_PRIMARY.includes(provider.channel);
   const { openModal, SelectPrimaryIntegrationModal } = useSelectPrimaryIntegrationModal();
 
+  const watchedConditions = useWatch({ control, name: 'conditions' });
+  const numOfConditions: number = useMemo(() => {
+    if (watchedConditions && watchedConditions[0] && watchedConditions[0].children) {
+      return watchedConditions[0].children.length;
+    }
+
+    return 0;
+  }, [watchedConditions]);
+
   const shouldSetNewPrimary = useMemo(() => {
     if (!provider) return false;
 
@@ -63,7 +77,9 @@ export const UpdateIntegrationSidebarHeader = ({
       openModal({
         environmentId: provider.environmentId,
         channelType: provider.channel,
-        exclude: [provider.integrationId],
+        exclude: (el: IntegrationEntity) => {
+          return el._id === provider.integrationId;
+        },
         onClose: () => {
           deleteIntegration({
             id: provider.integrationId,
@@ -105,6 +121,14 @@ export const UpdateIntegrationSidebarHeader = ({
         />
         <Group spacing={12} noWrap ml="auto">
           {children}
+          <PrimaryIconButton
+            primary={provider.primary}
+            onClick={() => {
+              makePrimaryIntegration({ id: provider.integrationId });
+            }}
+            conditions={numOfConditions}
+          />
+          <ConditionIconButton primary={provider.primary} onClick={openConditions} conditions={numOfConditions} />
           <div>
             <Dropdown
               withArrow={false}
@@ -122,7 +146,7 @@ export const UpdateIntegrationSidebarHeader = ({
                   onClick={() => {
                     makePrimaryIntegration({ id: provider.integrationId });
                   }}
-                  icon={<StarEmpty />}
+                  icon={<StarEmpty color={colorScheme === 'dark' ? colors.white : colors.B30} />}
                   disabled={isLoading || isMarkingPrimary}
                 >
                   Mark as primary
diff --git a/apps/web/src/pages/integrations/components/multi-provider/CreateProviderInstanceSidebar.tsx b/apps/web/src/pages/integrations/components/multi-provider/CreateProviderInstanceSidebar.tsx
index 52c3d37a996..41ab9eb2a4a 100644
--- a/apps/web/src/pages/integrations/components/multi-provider/CreateProviderInstanceSidebar.tsx
+++ b/apps/web/src/pages/integrations/components/multi-provider/CreateProviderInstanceSidebar.tsx
@@ -1,17 +1,19 @@
-import styled from '@emotion/styled';
-import { ActionIcon, Group, Radio, Text } from '@mantine/core';
-import { ChannelTypeEnum, ICreateIntegrationBodyDto, NOVU_PROVIDERS, providers } from '@novu/shared';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useEffect, useMemo } from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import styled from '@emotion/styled';
+import { ActionIcon, Group, Radio, Text, Input, useMantineTheme } from '@mantine/core';
+import { useDisclosure } from '@mantine/hooks';
+
+import { ChannelTypeEnum, ICreateIntegrationBodyDto, NOVU_PROVIDERS, providers } from '@novu/shared';
 
 import { createIntegration } from '../../../../api/integration';
 import { QueryKeys } from '../../../../api/query.keys';
 import { useSegment } from '../../../../components/providers/SegmentProvider';
 import { When } from '../../../../components/utils/When';
 import { Button, colors, NameInput, Sidebar } from '../../../../design-system';
+import { ConditionPlus, ArrowLeft, Condition } from '../../../../design-system/icons';
 import { inputStyles } from '../../../../design-system/config/inputs.styles';
-import { ArrowLeft } from '../../../../design-system/icons';
 import { useFetchEnvironments } from '../../../../hooks/useFetchEnvironments';
 import { CHANNEL_TYPE_TO_STRING } from '../../../../utils/channels';
 import { errorMessage, successMessage } from '../../../../utils/notifications';
@@ -19,10 +21,13 @@ import { IntegrationsStoreModalAnalytics } from '../../constants';
 import type { IntegrationEntity } from '../../types';
 import { useProviders } from '../../useProviders';
 import { ProviderImage } from './SelectProviderSidebar';
+import { Conditions, IConditions } from '../../../../components/conditions';
+import { ConditionIconButton } from '../ConditionIconButton';
 
 interface ICreateProviderInstanceForm {
   name: string;
   environmentId: string;
+  conditions: IConditions[];
 }
 
 export function CreateProviderInstanceSidebar({
@@ -40,11 +45,13 @@ export function CreateProviderInstanceSidebar({
   onGoBack: () => void;
   onIntegrationCreated: (id: string) => void;
 }) {
+  const { colorScheme } = useMantineTheme();
   const { environments, isLoading: areEnvironmentsLoading } = useFetchEnvironments();
   const { isLoading: areIntegrationsLoading, providers: integrations } = useProviders();
   const isLoading = areEnvironmentsLoading || areIntegrationsLoading;
   const queryClient = useQueryClient();
   const segment = useSegment();
+  const [conditionsFormOpened, { close: closeConditionsForm, open: openConditionsForm }] = useDisclosure(false);
 
   const provider = useMemo(
     () => providers.find((el) => el.channel === channel && el.id === providerId),
@@ -57,14 +64,23 @@ export function CreateProviderInstanceSidebar({
     ICreateIntegrationBodyDto
   >(createIntegration);
 
-  const { handleSubmit, control, reset, watch } = useForm<ICreateProviderInstanceForm>({
+  const { handleSubmit, control, reset, watch, setValue, getValues } = useForm<ICreateProviderInstanceForm>({
     shouldUseNativeValidation: false,
     defaultValues: {
       name: '',
       environmentId: '',
+      conditions: [],
     },
   });
 
+  const watchedConditions = watch('conditions');
+  const numOfConditions: number = useMemo(() => {
+    if (watchedConditions && watchedConditions[0] && watchedConditions[0].children) {
+      return watchedConditions[0].children.length;
+    }
+
+    return 0;
+  }, [watchedConditions]);
   const selectedEnvironmentId = watch('environmentId');
 
   const showNovuProvidersErrorMessage = useMemo(() => {
@@ -86,7 +102,7 @@ export function CreateProviderInstanceSidebar({
       }
 
       const { channel: selectedChannel } = provider;
-      const { environmentId } = data;
+      const { environmentId, conditions } = data;
 
       const { _id: integrationId } = await createIntegrationApi({
         providerId: provider.id,
@@ -95,6 +111,7 @@ export function CreateProviderInstanceSidebar({
         credentials: {},
         active: provider.channel === ChannelTypeEnum.IN_APP ? true : false,
         check: false,
+        conditions,
         _environmentId: environmentId,
       });
 
@@ -124,12 +141,30 @@ export function CreateProviderInstanceSidebar({
     reset({
       name: provider?.displayName ?? '',
       environmentId: environments.find((env) => env.name === 'Development')?._id || '',
+      conditions: [],
     });
   }, [environments, provider]);
 
   if (!provider) {
     return null;
   }
+  const updateConditions = (conditions: IConditions[]) => {
+    setValue('conditions', conditions, { shouldDirty: true });
+  };
+
+  if (conditionsFormOpened) {
+    const [conditions, name] = getValues(['conditions', 'name']);
+
+    return (
+      <Conditions
+        conditions={conditions}
+        name={name}
+        isOpened={conditionsFormOpened}
+        setConditions={updateConditions}
+        onClose={closeConditionsForm}
+      />
+    );
+  }
 
   return (
     <Sidebar
@@ -141,7 +176,7 @@ export function CreateProviderInstanceSidebar({
       }}
       onClose={onClose}
       customHeader={
-        <Group spacing={12} w="100%" h={40}>
+        <Group spacing={12} w="100%" h={40} noWrap>
           <ActionIcon onClick={onGoBack} variant={'transparent'} data-test-id="create-provider-instance-sidebar-back">
             <ArrowLeft color={colors.B80} />
           </ActionIcon>
@@ -162,6 +197,9 @@ export function CreateProviderInstanceSidebar({
               );
             }}
           />
+          <Group mt={-10} spacing={12} align="start" noWrap ml="auto">
+            <ConditionIconButton data-test-id="add-conditions-icon-btn" onClick={openConditionsForm} />
+          </Group>
         </Group>
       }
       customFooter={
@@ -231,6 +269,46 @@ export function CreateProviderInstanceSidebar({
           );
         }}
       />
+
+      <Input.Wrapper
+        label={
+          <>
+            <Group spacing={5}>
+              Conditions
+              <Text color={colors.B40} style={{ fontWeight: 'normal' }}>
+                (optional)
+              </Text>
+            </Group>
+          </>
+        }
+        description="Add a condition if you want to apply the provider instance to a specific tenant."
+        styles={inputStyles}
+      >
+        <Group mt={16} position="left">
+          <Button
+            variant="outline"
+            data-test-id="add-conditions-btn"
+            onClick={openConditionsForm}
+            icon={
+              <>
+                <When truthy={numOfConditions === 0}>
+                  <Group spacing={8}>
+                    <ConditionPlus />
+                  </Group>
+                </When>
+                <When truthy={numOfConditions > 0}>
+                  <Group spacing={2} color={colorScheme === 'dark' ? colors.white : colors.B30}>
+                    <Condition />
+                    {numOfConditions}
+                  </Group>
+                </When>
+              </>
+            }
+          >
+            {numOfConditions === 0 ? 'Add' : 'Edit'} conditions
+          </Button>
+        </Group>
+      </Input.Wrapper>
       <When truthy={showNovuProvidersErrorMessage}>
         <WarningMessage>
           <Text data-test-id="novu-provider-error">
diff --git a/apps/web/src/pages/integrations/components/multi-provider/SelectPrimaryIntegrationModal.tsx b/apps/web/src/pages/integrations/components/multi-provider/SelectPrimaryIntegrationModal.tsx
index 4c74643e7c7..53ebc5dd8d4 100644
--- a/apps/web/src/pages/integrations/components/multi-provider/SelectPrimaryIntegrationModal.tsx
+++ b/apps/web/src/pages/integrations/components/multi-provider/SelectPrimaryIntegrationModal.tsx
@@ -20,7 +20,7 @@ import { IntegrationEnvironmentPill } from '../IntegrationEnvironmentPill';
 import { useFetchEnvironments } from '../../../../hooks/useFetchEnvironments';
 import { CHANNEL_TYPE_TO_STRING } from '../../../../utils/channels';
 import { useIntegrations } from '../../../../hooks';
-import { ITableIntegration } from '../../types';
+import { IntegrationEntity, ITableIntegration } from '../../types';
 import { mapToTableIntegration } from '../../utils';
 import { IntegrationStatusCell } from '../IntegrationStatusCell';
 import { IntegrationNameCell } from '../IntegrationNameCell';
@@ -114,7 +114,7 @@ export interface ISelectPrimaryIntegrationModalProps {
   isOpened: boolean;
   environmentId?: string;
   channelType?: ChannelTypeEnum;
-  exclude?: string[];
+  exclude?: (integration: IntegrationEntity) => boolean;
   onClose: () => void;
 }
 
@@ -139,11 +139,14 @@ export const SelectPrimaryIntegrationModal = ({
 
   const { integrations, loading: areIntegrationsLoading } = useIntegrations();
   const { makePrimaryIntegration, isLoading: isMarkingPrimaryIntegration } = useMakePrimaryIntegration({
-    onSuccess: onCloseCallback,
+    onSuccess: () => onCloseCallback(),
   });
   const integrationsByEnvAndChannel = useMemo<ITableIntegration[]>(() => {
     const filteredIntegrations = (integrations ?? []).filter((el) => {
-      const isNotExcluded = !exclude?.includes(el._id ?? '');
+      let isNotExcluded = true;
+      if (exclude) {
+        isNotExcluded = !exclude(el);
+      }
 
       if (environmentId) {
         return el.channel === channelType && el._environmentId === environmentId && isNotExcluded;
@@ -206,7 +209,7 @@ export const SelectPrimaryIntegrationModal = ({
       shadow={theme.colorScheme === 'dark' ? shadows.dark : shadows.medium}
       radius="md"
       size="lg"
-      onClose={onCloseCallback}
+      onClose={() => onCloseCallback()}
     >
       <ModalBodyHolder data-test-id="select-primary-integration-modal">
         <Description>
@@ -243,7 +246,7 @@ export const SelectPrimaryIntegrationModal = ({
         <ButtonsHolder>
           {!isActive && !isInitialProviderSelected && (
             <Warning>
-              The selected provider instance will be activated as the primary provider cannot be disabled.
+              The selected provider instance will be activated as the primary provider can not be disabled.
             </Warning>
           )}
           <Button variant="outline" onClick={onCloseCallback}>
diff --git a/apps/web/src/pages/integrations/components/multi-provider/UpdateProviderSidebar.tsx b/apps/web/src/pages/integrations/components/multi-provider/UpdateProviderSidebar.tsx
index bcc647c4395..f4c706a2cb6 100644
--- a/apps/web/src/pages/integrations/components/multi-provider/UpdateProviderSidebar.tsx
+++ b/apps/web/src/pages/integrations/components/multi-provider/UpdateProviderSidebar.tsx
@@ -36,12 +36,15 @@ import { NovuInAppSetupWarning } from '../NovuInAppSetupWarning';
 import { NovuProviderSidebarContent } from './NovuProviderSidebarContent';
 import { useSelectPrimaryIntegrationModal } from './useSelectPrimaryIntegrationModal';
 import { ShareableUrl } from '../Modal/ConnectIntegrationForm';
+import { Conditions, IConditions } from '../../../../components/conditions';
+import { useDisclosure } from '@mantine/hooks';
 
 interface IProviderForm {
   name: string;
   credentials: ICredentialsDto;
   active: boolean;
   identifier: string;
+  conditions: IConditions[];
 }
 
 enum SidebarStateEnum {
@@ -65,9 +68,9 @@ export function UpdateProviderSidebar({
   const [framework, setFramework] = useState<FrameworkEnum | null>(null);
   const { providers, isLoading: areProvidersLoading } = useProviders();
   const isNovuInAppProvider = selectedProvider?.providerId === InAppProviderIdEnum.Novu;
-
   const { openModal: openSelectPrimaryIntegrationModal, SelectPrimaryIntegrationModal } =
     useSelectPrimaryIntegrationModal();
+  const [conditionsFormOpened, { close: closeConditionsForm, open: openConditionsForm }] = useDisclosure(false);
 
   const { updateIntegration, isLoadingUpdate } = useUpdateIntegration(selectedProvider?.integrationId || '');
 
@@ -79,6 +82,7 @@ export function UpdateProviderSidebar({
       credentials: {},
       active: false,
       identifier: '',
+      conditions: [],
     },
   });
   const {
@@ -87,6 +91,7 @@ export function UpdateProviderSidebar({
     reset,
     watch,
     setValue,
+    getValues,
     formState: { errors, isDirty, dirtyFields },
   } = methods;
 
@@ -138,6 +143,7 @@ export function UpdateProviderSidebar({
 
         return prev;
       }, {} as any),
+      conditions: foundProvider.conditions,
       active: foundProvider.active,
     });
   }, [integrationId, providers]);
@@ -167,22 +173,38 @@ export function UpdateProviderSidebar({
       return;
     }
 
-    const { channel: selectedChannel, environmentId, primary } = selectedProvider;
+    const { channel: selectedChannel, environmentId, primary, conditions } = selectedProvider;
     const isActiveFieldChanged = dirtyFields.active;
     const hasSameChannelActiveIntegration = !!providers
       .filter((el) => el.integrationId !== selectedProvider.integrationId)
       .find((el) => el.active && el.channel === selectedChannel && el.environmentId === environmentId);
     const isChannelSupportPrimary = CHANNELS_WITH_PRIMARY.includes(selectedChannel);
 
+    const isChangedToActive =
+      isActiveFieldChanged && isChannelSupportPrimary && isActive && hasSameChannelActiveIntegration;
+
+    const isChangedToInactiveAndIsPrimary =
+      isActiveFieldChanged && isChannelSupportPrimary && !isActive && primary && hasSameChannelActiveIntegration;
+
+    const isPrimaryAndHasConditionsApplied =
+      primary && conditions && conditions.length > 0 && hasSameChannelActiveIntegration;
+
+    const hasNoConditions = !conditions || conditions.length === 0;
+
+    const hasUpdatedConditions = data.conditions && data.conditions.length > 0;
+
+    const hasConditionsAndIsPrimary = hasUpdatedConditions && primary && dirtyFields.conditions;
+
     if (
-      isActiveFieldChanged &&
-      isChannelSupportPrimary &&
-      ((isActive && hasSameChannelActiveIntegration) || (!isActive && primary && hasSameChannelActiveIntegration))
+      (hasNoConditions && isChangedToActive) ||
+      isChangedToInactiveAndIsPrimary ||
+      isPrimaryAndHasConditionsApplied ||
+      hasConditionsAndIsPrimary
     ) {
       openSelectPrimaryIntegrationModal({
         environmentId: selectedProvider?.environmentId,
         channelType: selectedProvider?.channel,
-        exclude: !isActive ? [selectedProvider.integrationId] : undefined,
+        exclude: !isActive || hasConditionsAndIsPrimary ? (el) => el._id === selectedProvider.integrationId : undefined,
         onClose: () => {
           updateIntegration(data);
         },
@@ -206,6 +228,24 @@ export function UpdateProviderSidebar({
     name: `credentials.${CredentialsKeyEnum.Hmac}`,
   });
 
+  const updateConditions = (conditions: IConditions[]) => {
+    setValue('conditions', conditions, { shouldDirty: true });
+  };
+
+  if (conditionsFormOpened) {
+    const [conditions, name] = getValues(['conditions', 'name']);
+
+    return (
+      <Conditions
+        conditions={conditions}
+        name={name}
+        isOpened={conditionsFormOpened}
+        setConditions={updateConditions}
+        onClose={closeConditionsForm}
+      />
+    );
+  }
+
   if (
     SmsProviderIdEnum.Novu === selectedProvider?.providerId ||
     EmailProviderIdEnum.Novu === selectedProvider?.providerId
@@ -218,7 +258,11 @@ export function UpdateProviderSidebar({
           onClose={onSidebarClose}
           onSubmit={onSubmit}
           customHeader={
-            <UpdateIntegrationSidebarHeader provider={selectedProvider} onSuccessDelete={onSidebarClose}>
+            <UpdateIntegrationSidebarHeader
+              openConditions={openConditionsForm}
+              provider={selectedProvider}
+              onSuccessDelete={onSidebarClose}
+            >
               <Free>Test Provider</Free>
             </UpdateIntegrationSidebarHeader>
           }
@@ -254,7 +298,11 @@ export function UpdateProviderSidebar({
         onBack={onBack}
         customHeader={
           sidebarState === SidebarStateEnum.NORMAL ? (
-            <UpdateIntegrationSidebarHeader provider={selectedProvider} onSuccessDelete={onSidebarClose} />
+            <UpdateIntegrationSidebarHeader
+              openConditions={openConditionsForm}
+              provider={selectedProvider}
+              onSuccessDelete={onSidebarClose}
+            />
           ) : (
             <>
               <When truthy={isNovuInAppProvider}>
diff --git a/apps/web/src/pages/integrations/types.ts b/apps/web/src/pages/integrations/types.ts
index 0c1f6d72375..928afb31b56 100644
--- a/apps/web/src/pages/integrations/types.ts
+++ b/apps/web/src/pages/integrations/types.ts
@@ -6,6 +6,7 @@ import type {
   IProviderConfig,
   ProvidersIdEnum,
 } from '@novu/shared';
+import { IConditions } from '../../components/conditions';
 
 export interface ITableIntegration {
   name: string;
@@ -20,6 +21,7 @@ export interface ITableIntegration {
   environment: string;
   active: boolean;
   logoFileName: IProviderConfig['logoFileName'];
+  conditions?: IConditions[];
 }
 
 export interface IIntegratedProvider {
@@ -32,6 +34,7 @@ export interface IIntegratedProvider {
   comingSoon: boolean;
   active: boolean;
   connected: boolean;
+  conditions?: IConditions[];
   logoFileName: ILogoFileName;
   betaVersion: boolean;
   novu?: boolean;
@@ -50,6 +53,7 @@ export interface IntegrationEntity {
   providerId: ProvidersIdEnum;
   channel: ChannelTypeEnum;
   credentials: ICredentials;
+  conditions?: IConditions[];
   active: boolean;
   deleted: boolean;
   order: number;
diff --git a/apps/web/src/pages/integrations/useProviders.ts b/apps/web/src/pages/integrations/useProviders.ts
index ba7d5734acb..ec5c477566f 100644
--- a/apps/web/src/pages/integrations/useProviders.ts
+++ b/apps/web/src/pages/integrations/useProviders.ts
@@ -119,6 +119,7 @@ function initializeProvidersByIntegration(integrations: IntegrationEntity[]): II
         name: integrationItem?.name,
         identifier: integrationItem?.identifier,
         primary: integrationItem?.primary ?? false,
+        conditions: integrationItem?.conditions ?? [],
       };
     });
 }
diff --git a/apps/web/src/pages/integrations/utils.ts b/apps/web/src/pages/integrations/utils.ts
index d78a54b92ce..1104e3ac571 100644
--- a/apps/web/src/pages/integrations/utils.ts
+++ b/apps/web/src/pages/integrations/utils.ts
@@ -29,5 +29,6 @@ export const mapToTableIntegration = (
     active: integration.active,
     logoFileName,
     providerId: integration.providerId,
+    conditions: integration.conditions,
   };
 };
diff --git a/apps/web/src/pages/templates/WorkflowListPage.tsx b/apps/web/src/pages/templates/WorkflowListPage.tsx
index 8f18678f9b0..e6e461321a9 100644
--- a/apps/web/src/pages/templates/WorkflowListPage.tsx
+++ b/apps/web/src/pages/templates/WorkflowListPage.tsx
@@ -39,28 +39,27 @@ const columns: IExtendedColumn<INotificationTemplateExtended>[] = [
     maxWidth: 340,
     Cell: withCellLoading(({ row: { original } }) => (
       <Group spacing={8}>
-        <TooltipContainer>
-          <Tooltip
-            label="Some steps are missing a provider configuration or a primary provider, 
+        <Tooltip
+          error
+          label="Some steps are missing a provider configuration or a primary provider,
           causing some notifications to fail."
-            width={300}
-            multiline
-            disabled={
-              original.workflowIntegrationStatus?.hasActiveIntegrations &&
-              original.workflowIntegrationStatus?.hasPrimaryIntegrations !== false
-            }
-            position="top"
-          >
-            <div>
-              {original.workflowIntegrationStatus?.hasActiveIntegrations &&
-              original.workflowIntegrationStatus?.hasPrimaryIntegrations !== false ? (
-                <Bolt color={colors.B40} width="24px" height="24px" />
-              ) : (
-                <ProviderMissing width="24px" height="24px" />
-              )}
-            </div>
-          </Tooltip>
-        </TooltipContainer>
+          width={300}
+          multiline
+          disabled={
+            original.workflowIntegrationStatus?.hasActiveIntegrations &&
+            original.workflowIntegrationStatus?.hasPrimaryIntegrations !== false
+          }
+          position="top"
+        >
+          <div>
+            {original.workflowIntegrationStatus?.hasActiveIntegrations &&
+            original.workflowIntegrationStatus?.hasPrimaryIntegrations !== false ? (
+              <Bolt color={colors.B40} width="24px" height="24px" />
+            ) : (
+              <ProviderMissing width="24px" height="24px" />
+            )}
+          </div>
+        </Tooltip>
 
         <Tooltip label={original.name}>
           <div>
@@ -306,18 +305,3 @@ const StyledTag = styled(Tag)`
     max-width: 100%;
   }
 `;
-
-const TooltipContainer = styled.div`
-  & .mantine-Tooltip-tooltip {
-    color: ${colors.error};
-    padding: 16px;
-    font-size: 14px;
-    font-weight: 400;
-    border-radius: 8px;
-    background: linear-gradient(0deg, rgba(229, 69, 69, 0.2) 0%, rgba(229, 69, 69, 0.2) 100%), #23232b !important;
-  }
-
-  & .mantine-Tooltip-arrow {
-    background: linear-gradient(0deg, rgba(229, 69, 69, 0.2) 0%, rgba(229, 69, 69, 0.2) 100%), #23232b !important;
-  }
-`;
diff --git a/apps/web/src/pages/templates/workflow/SideBar/StepSettings.tsx b/apps/web/src/pages/templates/workflow/SideBar/StepSettings.tsx
index aec4e688048..73953261279 100644
--- a/apps/web/src/pages/templates/workflow/SideBar/StepSettings.tsx
+++ b/apps/web/src/pages/templates/workflow/SideBar/StepSettings.tsx
@@ -1,5 +1,9 @@
 import { Group } from '@mantine/core';
+import { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
+import { useParams } from 'react-router-dom';
+
+import { StepTypeEnum } from '@novu/shared';
 
 import { Button } from '../../../../design-system';
 import type { IForm } from '../../components/formTypes';
@@ -7,13 +11,9 @@ import { StepActiveSwitch } from '../StepActiveSwitch';
 import { useEnvController } from '../../../../hooks';
 import { ShouldStopOnFailSwitch } from '../ShouldStopOnFailSwitch';
 import { ReplyCallback, ReplyCallbackSwitch } from '../ReplyCallback';
-import { useParams } from 'react-router-dom';
-import { StepTypeEnum } from '@novu/shared';
 import { When } from '../../../../components/utils/When';
 import { FilterModal } from '../../filter/FilterModal';
-import { useState } from 'react';
-import { Filter } from '../../../../design-system/icons/actions/Filter';
-import { FilterGradient } from '../../../../design-system/icons/gradient/FilterGradient';
+import { FilterGradient, Filter } from '../../../../design-system/icons';
 import { FilterOutlined } from '../../../../design-system/icons/gradient/FilterOutlined';
 
 export function StepSettings({ index }: { index: number }) {
diff --git a/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.spec.ts b/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.spec.ts
index 77c59b720aa..e716e042800 100644
--- a/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.spec.ts
+++ b/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.spec.ts
@@ -1053,7 +1053,7 @@ describe('Message filter matcher', function () {
     it('should add a passed condition', () => {
       const result = MessageMatcher.sumFilters(
         {
-          stepFilters: [],
+          filters: [],
           failedFilters: [],
           passedFilters: ['payload'],
         },
@@ -1069,14 +1069,14 @@ describe('Message filter matcher', function () {
 
       expect(result.passedFilters).to.contain('payload');
       expect(result.passedFilters.length).to.eq(1);
-      expect(result.stepFilters.length).to.eq(1);
-      expect(result.stepFilters).to.contain('payload');
+      expect(result.filters.length).to.eq(1);
+      expect(result.filters).to.contain('payload');
     });
 
     it('should add a failed condition', () => {
       const result = MessageMatcher.sumFilters(
         {
-          stepFilters: [],
+          filters: [],
           failedFilters: [],
           passedFilters: [],
         },
@@ -1092,14 +1092,14 @@ describe('Message filter matcher', function () {
 
       expect(result.failedFilters).to.contain('payload');
       expect(result.failedFilters.length).to.eq(1);
-      expect(result.stepFilters.length).to.eq(1);
-      expect(result.stepFilters).to.contain('payload');
+      expect(result.filters.length).to.eq(1);
+      expect(result.filters).to.contain('payload');
     });
 
     it('should add online for both cases of online', () => {
       let result = MessageMatcher.sumFilters(
         {
-          stepFilters: [],
+          filters: [],
           failedFilters: [],
           passedFilters: [],
         },
@@ -1115,12 +1115,12 @@ describe('Message filter matcher', function () {
 
       expect(result.passedFilters).to.contain('online');
       expect(result.passedFilters.length).to.eq(1);
-      expect(result.stepFilters.length).to.eq(1);
-      expect(result.stepFilters).to.contain('online');
+      expect(result.filters.length).to.eq(1);
+      expect(result.filters).to.contain('online');
 
       result = MessageMatcher.sumFilters(
         {
-          stepFilters: [],
+          filters: [],
           failedFilters: [],
           passedFilters: [],
         },
@@ -1136,8 +1136,8 @@ describe('Message filter matcher', function () {
 
       expect(result.passedFilters).to.contain('online');
       expect(result.passedFilters.length).to.eq(1);
-      expect(result.stepFilters.length).to.eq(1);
-      expect(result.stepFilters).to.contain('online');
+      expect(result.filters.length).to.eq(1);
+      expect(result.filters).to.contain('online');
     });
   });
 });
diff --git a/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.ts b/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.ts
index 4608ed5da2e..58cb50536cf 100644
--- a/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/message-matcher/message-matcher.usecase.ts
@@ -3,7 +3,6 @@ import axios from 'axios';
 import { Injectable } from '@nestjs/common';
 import { parseISO, differenceInMinutes, differenceInHours, differenceInDays } from 'date-fns';
 import {
-  IBaseFieldFilterPart,
   FilterParts,
   IWebhookFilterPart,
   IRealtimeOnlineFilterPart,
@@ -27,11 +26,16 @@ import {
   MessageRepository,
   JobRepository,
 } from '@novu/dal';
-import { DetailEnum, CreateExecutionDetails, CreateExecutionDetailsCommand } from '@novu/application-generic';
+import {
+  DetailEnum,
+  CreateExecutionDetails,
+  CreateExecutionDetailsCommand,
+  Filter,
+  IFilterVariables,
+  FilterProcessingDetails,
+} from '@novu/application-generic';
 import { EmailEventStatusEnum } from '@novu/stateless';
 
-import { IFilterVariables } from './types';
-import { FilterProcessingDetails } from './filter-processing-details';
 import { SendMessageCommand } from '../send-message/send-message.command';
 import { EXCEPTION_MESSAGE_ON_WEBHOOK_FILTER, createHash, PlatformException } from '../../../shared/utils';
 
@@ -48,7 +52,7 @@ const differenceIn = (currentDate: Date, lastDate: Date, timeOperator: TimeOpera
 };
 
 @Injectable()
-export class MessageMatcher {
+export class MessageMatcher extends Filter {
   constructor(
     private subscriberRepository: SubscriberRepository,
     private createExecutionDetails: CreateExecutionDetails,
@@ -56,7 +60,9 @@ export class MessageMatcher {
     private executionDetailsRepository: ExecutionDetailsRepository,
     private messageRepository: MessageRepository,
     private jobRepository: JobRepository
-  ) {}
+  ) {
+    super();
+  }
 
   public async filter(
     command: SendMessageCommand,
@@ -75,7 +81,7 @@ export class MessageMatcher {
     if (step.filters?.length) {
       const details: FilterProcessingDetails[] = [];
 
-      const foundFilter = await findAsync(step.filters, async (filter) => {
+      const foundFilter = await this.findAsync(step.filters, async (filter) => {
         const filterProcessingDetails = new FilterProcessingDetails();
         filterProcessingDetails.addFilter(filter, variables);
 
@@ -141,7 +147,7 @@ export class MessageMatcher {
 
   public static sumFilters(
     summary: {
-      stepFilters: string[];
+      filters: string[];
       failedFilters: string[];
       passedFilters: string[];
     },
@@ -153,19 +159,7 @@ export class MessageMatcher {
       type = 'online';
     }
 
-    if (condition.passed && !summary.passedFilters.includes(type)) {
-      summary.passedFilters.push(type);
-    }
-
-    if (!condition.passed && !summary.failedFilters.includes(type)) {
-      summary.failedFilters.push(type);
-    }
-
-    if (!summary.stepFilters.includes(type)) {
-      summary.stepFilters.push(type);
-    }
-
-    return summary;
+    return Filter.sumFilters(summary, condition, type);
   }
 
   private async handleGroupFilters(
@@ -201,14 +195,14 @@ export class MessageMatcher {
   ): Promise<boolean> {
     const { webhookFilters, otherFilters } = this.splitFilters(filter);
 
-    const matchedOtherFilters = await filterAsync(otherFilters, (i) =>
+    const matchedOtherFilters = await this.filterAsync(otherFilters, (i) =>
       this.processFilter(variables, i, command, filterProcessingDetails)
     );
     if (otherFilters.length !== matchedOtherFilters.length) {
       return false;
     }
 
-    const matchedWebhookFilters = await filterAsync(webhookFilters, (i) =>
+    const matchedWebhookFilters = await this.filterAsync(webhookFilters, (i) =>
       this.processFilter(variables, i, command, filterProcessingDetails)
     );
 
@@ -223,14 +217,14 @@ export class MessageMatcher {
   ): Promise<boolean> {
     const { webhookFilters, otherFilters } = this.splitFilters(filter);
 
-    const foundFilter = await findAsync(otherFilters, (i) =>
+    const foundFilter = await this.findAsync(otherFilters, (i) =>
       this.processFilter(variables, i, command, filterProcessingDetails)
     );
     if (foundFilter) {
       return true;
     }
 
-    return !!(await findAsync(webhookFilters, (i) =>
+    return !!(await this.findAsync(webhookFilters, (i) =>
       this.processFilter(variables, i, command, filterProcessingDetails)
     ));
   }
@@ -373,56 +367,6 @@ export class MessageMatcher {
     return result;
   }
 
-  private processFilterEquality(
-    variables: IFilterVariables,
-    fieldFilter: IBaseFieldFilterPart,
-    filterProcessingDetails: FilterProcessingDetails
-  ): boolean {
-    const actualValue = _.get(variables, `${fieldFilter.on}.${fieldFilter.field}`);
-    const filterValue = this.parseValue(actualValue, fieldFilter.value);
-    let result = false;
-
-    if (fieldFilter.operator === 'EQUAL') {
-      result = actualValue === filterValue;
-    }
-    if (fieldFilter.operator === 'NOT_EQUAL') {
-      result = actualValue !== filterValue;
-    }
-    if (fieldFilter.operator === 'LARGER') {
-      result = actualValue > filterValue;
-    }
-    if (fieldFilter.operator === 'SMALLER') {
-      result = actualValue < filterValue;
-    }
-    if (fieldFilter.operator === 'LARGER_EQUAL') {
-      result = actualValue >= filterValue;
-    }
-    if (fieldFilter.operator === 'SMALLER_EQUAL') {
-      result = actualValue <= filterValue;
-    }
-    if (fieldFilter.operator === 'NOT_IN') {
-      result = !actualValue.includes(filterValue);
-    }
-    if (fieldFilter.operator === 'IN') {
-      result = actualValue.includes(filterValue);
-    }
-    if (fieldFilter.operator === 'IS_DEFINED') {
-      result = actualValue !== undefined;
-    }
-    const actualValueString: string = Array.isArray(actualValue) ? JSON.stringify(actualValue) : `${actualValue ?? ''}`;
-
-    filterProcessingDetails.addCondition({
-      filter: FILTER_TO_LABEL[fieldFilter.on],
-      field: fieldFilter.field,
-      expected: `${filterValue}`,
-      actual: `${actualValueString}`,
-      operator: `${fieldFilter.operator}`,
-      passed: result,
-    });
-
-    return result;
-  }
-
   private async getWebhookResponse(
     child: IWebhookFilterPart,
     variables: IFilterVariables,
@@ -529,37 +473,4 @@ export class MessageMatcher {
 
     return passed;
   }
-
-  private parseValue(originValue, parsingValue) {
-    switch (typeof originValue) {
-      case 'number':
-        return Number(parsingValue);
-      case 'string':
-        return String(parsingValue);
-      case 'boolean':
-        return parsingValue === 'true';
-      case 'bigint':
-        return Number(parsingValue);
-      default:
-        return parsingValue;
-    }
-  }
-}
-
-async function findAsync<T>(array: T[], predicate: (t: T) => Promise<boolean>): Promise<T | undefined> {
-  for (const t of array) {
-    if (await predicate(t)) {
-      return t;
-    }
-  }
-
-  return undefined;
-}
-
-async function filterAsync<T>(arr: T[], callback: (item: T) => Promise<boolean>): Promise<T[]> {
-  const fail = Symbol('Filter Async failure');
-
-  return (await Promise.all(arr.map(async (item) => ((await callback(item)) ? item : fail)))).filter(
-    (i) => i !== fail
-  ) as T[];
 }
diff --git a/apps/worker/src/app/workflow/usecases/message-matcher/types.ts b/apps/worker/src/app/workflow/usecases/message-matcher/types.ts
deleted file mode 100644
index d159545a1e7..00000000000
--- a/apps/worker/src/app/workflow/usecases/message-matcher/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { ITriggerPayload } from '@novu/shared';
-import type { SubscriberEntity } from '@novu/dal';
-
-export interface IFilterVariables {
-  payload?: ITriggerPayload;
-  subscriber?: SubscriberEntity;
-  webhook?: Record<string, unknown>;
-}
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-chat.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-chat.usecase.ts
index aad147e1c57..8b6ea72d913 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-chat.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-chat.usecase.ts
@@ -162,6 +162,9 @@ export class SendMessageChat extends SendMessageBase {
       providerId: subscriberChannel.providerId,
       channelType: ChannelTypeEnum.CHAT,
       userId: command.userId,
+      filterData: {
+        tenant: command.job.tenant,
+      },
     });
 
     const chatWebhookUrl = command.payload.webhookUrl || subscriberChannel.credentials?.webhookUrl;
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
index 3139f5c23fd..d79b2516ac3 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
@@ -77,20 +77,15 @@ export class SendMessageEmail extends SendMessageBase {
 
     const overrideSelectedIntegration = command.overrides?.email?.integrationIdentifier;
     try {
-      const getIntegrationCommand = {
-        organizationId: command.organizationId,
-        environmentId: command.environmentId,
-        channelType: ChannelTypeEnum.EMAIL,
-        userId: command.userId,
-        identifier: overrideSelectedIntegration as string,
-      };
-
       integration = await this.getIntegration({
         organizationId: command.organizationId,
         environmentId: command.environmentId,
         channelType: ChannelTypeEnum.EMAIL,
         userId: command.userId,
         identifier: overrideSelectedIntegration as string,
+        filterData: {
+          tenant: command.job.tenant,
+        },
       });
     } catch (e) {
       await this.createExecutionDetails.execute(
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-in-app.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-in-app.usecase.ts
index f48b38684e3..7b8f949b7b8 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-in-app.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-in-app.usecase.ts
@@ -86,6 +86,9 @@ export class SendMessageInApp extends SendMessageBase {
       environmentId: command.environmentId,
       channelType: ChannelTypeEnum.IN_APP,
       userId: command.userId,
+      filterData: {
+        tenant: command.job.tenant,
+      },
     });
 
     if (!integration) {
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-push.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-push.usecase.ts
index 42247a8a9f8..9a1759873c3 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-push.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-push.usecase.ts
@@ -145,6 +145,9 @@ export class SendMessagePush extends SendMessageBase {
         channelType: ChannelTypeEnum.PUSH,
         providerId: channel.providerId,
         userId: command.userId,
+        filterData: {
+          tenant: command.job.tenant,
+        },
       });
 
       if (!integration) {
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-sms.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-sms.usecase.ts
index 1f08fe264eb..c606a5dbc09 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-sms.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-sms.usecase.ts
@@ -67,6 +67,9 @@ export class SendMessageSms extends SendMessageBase {
       channelType: ChannelTypeEnum.SMS,
       userId: command.userId,
       identifier: overrideSelectedIntegration as string,
+      filterData: {
+        tenant: command.job.tenant,
+      },
     });
 
     Sentry.addBreadcrumb({
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message.usecase.ts
index 3d28111088a..653f06c360b 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message.usecase.ts
@@ -67,7 +67,7 @@ export class SendMessage {
 
     if (!command.payload?.$on_boarding_trigger) {
       const usedFilters = shouldRun.conditions.reduce(MessageMatcher.sumFilters, {
-        stepFilters: [],
+        filters: [],
         failedFilters: [],
         passedFilters: [],
       });
diff --git a/apps/worker/src/app/workflow/workflow.module.ts b/apps/worker/src/app/workflow/workflow.module.ts
index 9f9f086d388..a3fe453ee83 100644
--- a/apps/worker/src/app/workflow/workflow.module.ts
+++ b/apps/worker/src/app/workflow/workflow.module.ts
@@ -10,7 +10,6 @@ import {
   CompileEmailTemplate,
   CompileTemplate,
   CreateExecutionDetails,
-  CreateSubscriber,
   GetDecryptedIntegrations,
   GetLayoutUseCase,
   GetNovuLayout,
@@ -24,12 +23,12 @@ import {
   SendTestEmail,
   SendTestEmailCommand,
   StoreSubscriberJobs,
+  ConditionsFilter,
   TriggerEvent,
-  UpdateSubscriber,
 } from '@novu/application-generic';
-import { JobRepository, MessageRepository, OrganizationRepository, SubscriberRepository } from '@novu/dal';
+import { JobRepository } from '@novu/dal';
 
-import { JobMetricService, StandardWorker, WorkflowWorker, OldInstanceWorkflowWorker } from './services';
+import { StandardWorker, WorkflowWorker, OldInstanceWorkflowWorker } from './services';
 import {
   MessageMatcher,
   SendMessage,
@@ -51,7 +50,6 @@ import {
   WebhookFilterBackoffStrategy,
 } from './usecases';
 
-import { CreateLog } from '../shared/logs';
 import { SharedModule } from '../shared/shared.module';
 
 const REPOSITORIES = [JobRepository];
@@ -64,6 +62,8 @@ const USE_CASES = [
   CompileEmailTemplate,
   CompileTemplate,
   CreateExecutionDetails,
+  ConditionsFilter,
+  BulkCreateExecutionDetails,
   Digest,
   GetDecryptedIntegrations,
   GetDigestEventsBackoff,
diff --git a/libs/dal/src/repositories/integration/integration.entity.ts b/libs/dal/src/repositories/integration/integration.entity.ts
index afe29c4245b..64273b240d4 100644
--- a/libs/dal/src/repositories/integration/integration.entity.ts
+++ b/libs/dal/src/repositories/integration/integration.entity.ts
@@ -1,8 +1,9 @@
-import { ChannelTypeEnum, ICredentials } from '@novu/shared';
+import { BuilderFieldType, BuilderGroupValues, ChannelTypeEnum, FilterParts, ICredentials } from '@novu/shared';
 
 import type { EnvironmentId } from '../environment';
 import type { OrganizationId } from '../organization';
 import { ChangePropsValueType } from '../../types/helpers';
+import { StepFilter } from '../notification-template';
 
 export class IntegrationEntity {
   _id: string;
@@ -32,6 +33,8 @@ export class IntegrationEntity {
   deletedAt: string;
 
   deletedBy: string;
+
+  conditions?: StepFilter[];
 }
 
 export type ICredentialsEntity = ICredentials;
diff --git a/libs/dal/src/repositories/integration/integration.schema.ts b/libs/dal/src/repositories/integration/integration.schema.ts
index 6fdff2d34fd..2789b1d21a9 100644
--- a/libs/dal/src/repositories/integration/integration.schema.ts
+++ b/libs/dal/src/repositories/integration/integration.schema.ts
@@ -61,6 +61,23 @@ const integrationSchema = new Schema<IntegrationDBModel>(
       type: Schema.Types.Boolean,
       default: false,
     },
+    conditions: [
+      {
+        isNegated: Schema.Types.Boolean,
+        type: {
+          type: Schema.Types.String,
+        },
+        value: Schema.Types.String,
+        children: [
+          {
+            field: Schema.Types.String,
+            value: Schema.Types.Mixed,
+            operator: Schema.Types.String,
+            on: Schema.Types.String,
+          },
+        ],
+      },
+    ],
   },
   schemaOptions
 );
diff --git a/libs/shared/src/consts/filters/filters.ts b/libs/shared/src/consts/filters/filters.ts
index 9a7eac4db05..1bc00920ad3 100644
--- a/libs/shared/src/consts/filters/filters.ts
+++ b/libs/shared/src/consts/filters/filters.ts
@@ -2,6 +2,7 @@ import { FilterPartTypeEnum } from '../../types';
 
 export const FILTER_TO_LABEL = {
   [FilterPartTypeEnum.PAYLOAD]: 'Payload',
+  [FilterPartTypeEnum.TENANT]: 'Tenant',
   [FilterPartTypeEnum.SUBSCRIBER]: 'Subscriber',
   [FilterPartTypeEnum.WEBHOOK]: 'Webhook',
   [FilterPartTypeEnum.IS_ONLINE]: 'Online right now',
diff --git a/libs/shared/src/dto/integration/construct-integration.interface.ts b/libs/shared/src/dto/integration/construct-integration.interface.ts
index 5754dd8dc37..8b3cc2c02ff 100644
--- a/libs/shared/src/dto/integration/construct-integration.interface.ts
+++ b/libs/shared/src/dto/integration/construct-integration.interface.ts
@@ -1,5 +1,6 @@
 import { ICredentials } from '../../entities/integration';
 import type { EnvironmentId } from '../../types';
+import { BuilderFieldType, BuilderGroupValues, FilterParts } from '../../types';
 
 export type ICredentialsDto = ICredentials;
 
@@ -10,4 +11,10 @@ export interface IConstructIntegrationDto {
   credentials?: ICredentialsDto;
   active?: boolean;
   check?: boolean;
+  conditions?: {
+    isNegated?: boolean;
+    type?: BuilderFieldType;
+    value?: BuilderGroupValues;
+    children?: FilterParts[];
+  }[];
 }
diff --git a/libs/shared/src/types/builder/filter.types.ts b/libs/shared/src/types/builder/filter.types.ts
index 75469227408..6faee7c3375 100644
--- a/libs/shared/src/types/builder/filter.types.ts
+++ b/libs/shared/src/types/builder/filter.types.ts
@@ -13,6 +13,7 @@ export enum FilterPartTypeEnum {
   IS_ONLINE = 'isOnline',
   IS_ONLINE_IN_LAST = 'isOnlineInLast',
   PREVIOUS_STEP = 'previousStep',
+  TENANT = 'tenant',
 }
 
 export enum PreviousStepTypeEnum {
@@ -51,6 +52,10 @@ export interface IWebhookFilterPart extends IBaseFieldFilterPart {
   webhookUrl: string;
 }
 
+export interface ITenantFilterPart extends IBaseFieldFilterPart {
+  on: FilterPartTypeEnum.TENANT;
+}
+
 export interface IRealtimeOnlineFilterPart extends IBaseFilterPart {
   on: FilterPartTypeEnum.IS_ONLINE;
   value: boolean;
@@ -67,7 +72,8 @@ export type FilterParts =
   | IWebhookFilterPart
   | IRealtimeOnlineFilterPart
   | IOnlineInLastFilterPart
-  | IPreviousStepFilterPart;
+  | IPreviousStepFilterPart
+  | ITenantFilterPart;
 
 export type Operator = BuilderFieldOperator | TimeOperatorEnum;
 
diff --git a/packages/application-generic/src/index.ts b/packages/application-generic/src/index.ts
index d9999850ccd..86e982129dd 100644
--- a/packages/application-generic/src/index.ts
+++ b/packages/application-generic/src/index.ts
@@ -8,7 +8,9 @@ export * from './logging/index';
 export * from './modules';
 export * from './usecases';
 export * from './instrumentation/index';
-export * from './resilience';
 export * from './utils/subscriber';
+export * from './utils/filter';
+export * from './utils/filter-processing-details';
+export * from './resilience';
 export * from './utils/exceptions';
 export * from './utils/email-normalization';
diff --git a/packages/application-generic/src/usecases/conditions-filter/conditions-filter.command.ts b/packages/application-generic/src/usecases/conditions-filter/conditions-filter.command.ts
new file mode 100644
index 00000000000..2ea1e94a2d1
--- /dev/null
+++ b/packages/application-generic/src/usecases/conditions-filter/conditions-filter.command.ts
@@ -0,0 +1,13 @@
+import { StepFilter } from '@novu/dal';
+import {
+  BuilderFieldType,
+  BuilderGroupValues,
+  FilterParts,
+} from '@novu/shared';
+import { IsDefined } from 'class-validator';
+import { EnvironmentWithUserCommand } from '../../commands';
+
+export class ConditionsFilterCommand extends EnvironmentWithUserCommand {
+  @IsDefined()
+  filters: StepFilter[];
+}
diff --git a/packages/application-generic/src/usecases/conditions-filter/conditions-filter.usecase.ts b/packages/application-generic/src/usecases/conditions-filter/conditions-filter.usecase.ts
new file mode 100644
index 00000000000..876891081d5
--- /dev/null
+++ b/packages/application-generic/src/usecases/conditions-filter/conditions-filter.usecase.ts
@@ -0,0 +1,146 @@
+import { Injectable } from '@nestjs/common';
+import { StepFilter } from '@novu/dal';
+import { FilterParts, FilterPartTypeEnum, ICondition } from '@novu/shared';
+import { Filter } from '../../utils/filter';
+import {
+  FilterProcessingDetails,
+  IFilterVariables,
+} from '../../utils/filter-processing-details';
+import { ConditionsFilterCommand } from './conditions-filter.command';
+
+@Injectable()
+export class ConditionsFilter extends Filter {
+  public async filter(
+    command: ConditionsFilterCommand,
+    variables: IFilterVariables
+  ): Promise<{
+    passed: boolean;
+    conditions: ICondition[];
+  }> {
+    const { filters } = command;
+    if (!filters || !Array.isArray(filters) || filters.length === 0) {
+      return {
+        passed: true,
+        conditions: [],
+      };
+    }
+
+    const details: FilterProcessingDetails[] = [];
+
+    const foundFilter = await this.findAsync(filters, async (filter) => {
+      const filterProcessingDetails = new FilterProcessingDetails();
+      filterProcessingDetails.addFilter(filter, variables);
+
+      const children = filter.children;
+      const noRules =
+        !children || (Array.isArray(children) && children.length === 0);
+      if (noRules) {
+        return true;
+      }
+
+      const singleRule =
+        !children || (Array.isArray(children) && children.length === 1);
+      if (singleRule) {
+        const result = await this.processFilter(
+          variables,
+          children[0],
+          filterProcessingDetails
+        );
+
+        details.push(filterProcessingDetails);
+
+        return result;
+      }
+
+      const result = await this.handleGroupFilters(
+        filter,
+        variables,
+
+        filterProcessingDetails
+      );
+
+      details.push(filterProcessingDetails);
+
+      return result;
+    });
+
+    const conditions = details
+      .map((detail) => detail.toObject().conditions)
+      .reduce(
+        (conditionsArray, collection) => [...collection, ...conditionsArray],
+        []
+      );
+
+    return {
+      passed: !!foundFilter,
+      conditions: conditions,
+    };
+  }
+
+  private async handleGroupFilters(
+    filter: StepFilter,
+    variables: IFilterVariables,
+    filterProcessingDetails: FilterProcessingDetails
+  ): Promise<boolean> {
+    if (filter.value === 'OR') {
+      return await this.handleOrFilters(
+        filter,
+        variables,
+
+        filterProcessingDetails
+      );
+    }
+
+    if (filter.value === 'AND') {
+      return await this.handleAndFilters(
+        filter,
+        variables,
+        filterProcessingDetails
+      );
+    }
+
+    return false;
+  }
+
+  private async handleAndFilters(
+    filter: StepFilter,
+    variables: IFilterVariables,
+    filterProcessingDetails: FilterProcessingDetails
+  ): Promise<boolean> {
+    const matchedOtherFilters = await this.filterAsync(filter.children, (i) =>
+      this.processFilter(variables, i, filterProcessingDetails)
+    );
+
+    return filter.children.length === matchedOtherFilters.length;
+  }
+
+  private async handleOrFilters(
+    filter: StepFilter,
+    variables: IFilterVariables,
+    filterProcessingDetails: FilterProcessingDetails
+  ): Promise<boolean> {
+    const foundFilter = await this.findAsync(filter.children, (i) =>
+      this.processFilter(variables, i, filterProcessingDetails)
+    );
+
+    return !!foundFilter;
+  }
+
+  private async processFilter(
+    variables: IFilterVariables,
+    child: FilterParts,
+    filterProcessingDetails: FilterProcessingDetails
+  ): Promise<boolean> {
+    let passed = false;
+
+    if (child.on === FilterPartTypeEnum.TENANT) {
+      passed = this.processFilterEquality(
+        variables,
+        child,
+        filterProcessingDetails
+      );
+    }
+
+    return passed;
+  }
+}
diff --git a/packages/application-generic/src/usecases/conditions-filter/index.ts b/packages/application-generic/src/usecases/conditions-filter/index.ts
new file mode 100644
index 00000000000..c62412cb49d
--- /dev/null
+++ b/packages/application-generic/src/usecases/conditions-filter/index.ts
@@ -0,0 +1,2 @@
+export * from './conditions-filter.command';
+export * from './conditions-filter.usecase';
diff --git a/packages/application-generic/src/usecases/index.ts b/packages/application-generic/src/usecases/index.ts
index 86b44781c05..cec41c573b7 100644
--- a/packages/application-generic/src/usecases/index.ts
+++ b/packages/application-generic/src/usecases/index.ts
@@ -24,6 +24,7 @@ export * from './update-tenant';
 export * from './create-tenant';
 export * from './get-tenant';
 export * from './process-tenant';
+export * from './conditions-filter';
 export * from './switch-environment';
 export * from './switch-organization';
 export * from './create-user';
diff --git a/packages/application-generic/src/usecases/select-integration/select-integration.command.ts b/packages/application-generic/src/usecases/select-integration/select-integration.command.ts
index c4a47c76bf0..27b1f65464f 100644
--- a/packages/application-generic/src/usecases/select-integration/select-integration.command.ts
+++ b/packages/application-generic/src/usecases/select-integration/select-integration.command.ts
@@ -1,5 +1,5 @@
 import { IsDefined, IsMongoId, IsOptional } from 'class-validator';
-import { ChannelTypeEnum, ProvidersIdEnum } from '@novu/shared';
+import { ChannelTypeEnum, ITenantDefine, ProvidersIdEnum } from '@novu/shared';
 
 import { EnvironmentWithUserCommand } from '../../commands/project.command';
 
@@ -16,4 +16,9 @@ export class SelectIntegrationCommand extends EnvironmentWithUserCommand {
 
   @IsOptional()
   providerId?: ProvidersIdEnum;
+
+  @IsDefined()
+  filterData: {
+    tenant?: ITenantDefine;
+  };
 }
diff --git a/packages/application-generic/src/usecases/select-integration/select-integration.spec.ts b/packages/application-generic/src/usecases/select-integration/select-integration.spec.ts
index 82e5c16bc2b..58b6e43fe11 100644
--- a/packages/application-generic/src/usecases/select-integration/select-integration.spec.ts
+++ b/packages/application-generic/src/usecases/select-integration/select-integration.spec.ts
@@ -1,11 +1,16 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { ChannelTypeEnum, EmailProviderIdEnum } from '@novu/shared';
-import { IntegrationEntity, IntegrationRepository } from '@novu/dal';
+import {
+  IntegrationEntity,
+  IntegrationRepository,
+  TenantRepository,
+} from '@novu/dal';
 
 import { SelectIntegration } from './select-integration.usecase';
 import { SelectIntegrationCommand } from './select-integration.command';
 import { GetIsMultiProviderConfigurationEnabled } from '../get-feature-flag';
 import { GetDecryptedIntegrations } from '../get-decrypted-integrations';
+import { ConditionsFilter } from '../conditions-filter';
 
 const testIntegration: IntegrationEntity = {
   _environmentId: 'env-test-123',
@@ -90,9 +95,11 @@ describe('select integration', function () {
     useCase = new SelectIntegration(
       new IntegrationRepository() as any,
       // @ts-ignore
-      new GetIsMultiProviderConfigurationEnabled(),
+      new GetDecryptedIntegrations(),
+      new ConditionsFilter(),
+      new TenantRepository(),
       // @ts-ignore
-      new GetDecryptedIntegrations()
+      new GetIsMultiProviderConfigurationEnabled()
     );
     jest.clearAllMocks();
   });
@@ -104,6 +111,7 @@ describe('select integration', function () {
         environmentId: 'environmentId',
         organizationId: 'organizationId',
         userId: 'userId',
+        filterData: {},
       })
     );
 
@@ -120,6 +128,7 @@ describe('select integration', function () {
         environmentId: 'environmentId',
         organizationId: 'organizationId',
         userId: 'userId',
+        filterData: {},
       })
     );
 
@@ -151,6 +160,7 @@ describe('select integration', function () {
           environmentId,
           organizationId,
           userId,
+          filterData: {},
         })
       );
 
diff --git a/packages/application-generic/src/usecases/select-integration/select-integration.usecase.ts b/packages/application-generic/src/usecases/select-integration/select-integration.usecase.ts
index 96749f9a66e..f00f956a36a 100644
--- a/packages/application-generic/src/usecases/select-integration/select-integration.usecase.ts
+++ b/packages/application-generic/src/usecases/select-integration/select-integration.usecase.ts
@@ -1,8 +1,14 @@
 import { Injectable } from '@nestjs/common';
-import { IntegrationEntity, IntegrationRepository } from '@novu/dal';
+import {
+  IntegrationEntity,
+  IntegrationRepository,
+  TenantEntity,
+  TenantRepository,
+} from '@novu/dal';
 import { CHANNELS_WITH_PRIMARY } from '@novu/shared';
 
 import { SelectIntegrationCommand } from './select-integration.command';
+import { ConditionsFilter } from '../conditions-filter/conditions-filter.usecase';
 import { buildIntegrationKey, CachedQuery } from '../../services/cache';
 import {
   FeatureFlagCommand,
@@ -12,6 +18,7 @@ import {
   GetDecryptedIntegrations,
   GetDecryptedIntegrationsCommand,
 } from '../get-decrypted-integrations';
+import { ConditionsFilterCommand } from '../conditions-filter';
 
 const LOG_CONTEXT = 'SelectIntegration';
 
@@ -19,8 +26,10 @@ const LOG_CONTEXT = 'SelectIntegration';
 export class SelectIntegration {
   constructor(
     private integrationRepository: IntegrationRepository,
-    protected getIsMultiProviderConfigurationEnabled: GetIsMultiProviderConfigurationEnabled,
-    protected getDecryptedIntegrationsUsecase: GetDecryptedIntegrations
+    protected getDecryptedIntegrationsUsecase: GetDecryptedIntegrations,
+    protected conditionsFilter: ConditionsFilter,
+    private tenantRepository: TenantRepository,
+    protected getIsMultiProviderConfigurationEnabled: GetIsMultiProviderConfigurationEnabled
   ) {}
 
   @CachedQuery({
@@ -57,6 +66,65 @@ export class SelectIntegration {
       return integrations[0];
     }
 
+    let integration: IntegrationEntity | null =
+      await this.getPrimaryIntegration(command);
+
+    if (!command.identifier && command.filterData.tenant) {
+      const query: Partial<IntegrationEntity> & { _organizationId: string } = {
+        ...(command.id ? { id: command.id } : {}),
+        _organizationId: command.organizationId,
+        _environmentId: command.environmentId,
+        channel: command.channelType,
+        ...(command.providerId ? { providerId: command.providerId } : {}),
+        active: true,
+      };
+
+      let tenant: TenantEntity | null = null;
+
+      if (command.filterData.tenant.identifier) {
+        tenant = await this.tenantRepository.findOne({
+          identifier: command.filterData.tenant.identifier,
+        });
+      }
+
+      const integrations = await this.integrationRepository.find(query);
+
+      for (const currentIntegration of integrations) {
+        if (
+          !currentIntegration.conditions ||
+          currentIntegration.conditions.length === 0
+        ) {
+          continue;
+        }
+
+        const { passed } = await this.conditionsFilter.filter(
+          ConditionsFilterCommand.create({
+            filters: currentIntegration.conditions,
+            environmentId: command.environmentId,
+            organizationId: command.organizationId,
+            userId: command.userId,
+          }),
+          {
+            tenant,
+          }
+        );
+        if (passed) {
+          integration = currentIntegration;
+          break;
+        }
+      }
+    }
+
+    if (!integration) {
+      return;
+    }
+
+    return GetDecryptedIntegrations.getDecryptedCredentials(integration);
+  }
+
+  private async getPrimaryIntegration(
+    command: SelectIntegrationCommand
+  ): Promise<IntegrationEntity | null> {
     const isChannelSupportsPrimary = CHANNELS_WITH_PRIMARY.includes(
       command.channelType
     );
@@ -82,16 +150,8 @@ export class SelectIntegration {
       };
     }
 
-    const integration = await this.integrationRepository.findOne(
-      query,
-      undefined,
-      { query: { sort: { createdAt: -1 } } }
-    );
-
-    if (!integration) {
-      return;
-    }
-
-    return GetDecryptedIntegrations.getDecryptedCredentials(integration);
+    return await this.integrationRepository.findOne(query, undefined, {
+      query: { sort: { createdAt: -1 } },
+    });
   }
 }
diff --git a/packages/application-generic/src/usecases/send-test-email/send-test-email.usecase.ts b/packages/application-generic/src/usecases/send-test-email/send-test-email.usecase.ts
index 3f1e5d7864f..864667d43b0 100644
--- a/packages/application-generic/src/usecases/send-test-email/send-test-email.usecase.ts
+++ b/packages/application-generic/src/usecases/send-test-email/send-test-email.usecase.ts
@@ -49,6 +49,7 @@ export class SendTestEmail {
         environmentId: command.environmentId,
         channelType: ChannelTypeEnum.EMAIL,
         userId: command.userId,
+        filterData: {},
       })
     );
 
diff --git a/apps/worker/src/app/workflow/usecases/message-matcher/filter-processing-details.ts b/packages/application-generic/src/utils/filter-processing-details.ts
similarity index 65%
rename from apps/worker/src/app/workflow/usecases/message-matcher/filter-processing-details.ts
rename to packages/application-generic/src/utils/filter-processing-details.ts
index 1ccef11d3ae..c234ffd9a78 100644
--- a/apps/worker/src/app/workflow/usecases/message-matcher/filter-processing-details.ts
+++ b/packages/application-generic/src/utils/filter-processing-details.ts
@@ -1,7 +1,12 @@
-import { StepFilter } from '@novu/dal';
-import { ICondition } from '@novu/shared';
+import { StepFilter, SubscriberEntity, TenantEntity } from '@novu/dal';
+import { ICondition, ITenantDefine, ITriggerPayload } from '@novu/shared';
 
-import { IFilterVariables } from './types';
+export interface IFilterVariables {
+  payload?: ITriggerPayload;
+  subscriber?: SubscriberEntity;
+  webhook?: Record<string, unknown>;
+  tenant?: TenantEntity;
+}
 
 export class FilterProcessingDetails {
   private conditions: ICondition[] = [];
diff --git a/packages/application-generic/src/utils/filter.ts b/packages/application-generic/src/utils/filter.ts
new file mode 100644
index 00000000000..066df2643e9
--- /dev/null
+++ b/packages/application-generic/src/utils/filter.ts
@@ -0,0 +1,139 @@
+import * as _ from 'lodash';
+import {
+  IBaseFieldFilterPart,
+  FILTER_TO_LABEL,
+  ICondition,
+} from '@novu/shared';
+
+import {
+  FilterProcessingDetails,
+  IFilterVariables,
+} from './filter-processing-details';
+
+export abstract class Filter {
+  protected processFilterEquality(
+    variables: IFilterVariables,
+    fieldFilter: IBaseFieldFilterPart,
+    filterProcessingDetails: FilterProcessingDetails
+  ): boolean {
+    const actualValue = _.get(
+      variables,
+      `${fieldFilter.on}.${fieldFilter.field}`
+    );
+    const filterValue = this.parseValue(actualValue, fieldFilter.value);
+    let result = false;
+
+    if (fieldFilter.operator === 'EQUAL') {
+      result = actualValue === filterValue;
+    }
+    if (fieldFilter.operator === 'NOT_EQUAL') {
+      result = actualValue !== filterValue;
+    }
+    if (fieldFilter.operator === 'LARGER') {
+      result = actualValue > filterValue;
+    }
+    if (fieldFilter.operator === 'SMALLER') {
+      result = actualValue < filterValue;
+    }
+    if (fieldFilter.operator === 'LARGER_EQUAL') {
+      result = actualValue >= filterValue;
+    }
+    if (fieldFilter.operator === 'SMALLER_EQUAL') {
+      result = actualValue <= filterValue;
+    }
+    if (fieldFilter.operator === 'NOT_IN') {
+      result = !actualValue.includes(filterValue);
+    }
+    if (fieldFilter.operator === 'IN') {
+      result = actualValue.includes(filterValue);
+    }
+    if (fieldFilter.operator === 'IS_DEFINED') {
+      result = actualValue !== undefined;
+    }
+    const actualValueString: string = Array.isArray(actualValue)
+      ? JSON.stringify(actualValue)
+      : `${actualValue ?? ''}`;
+
+    filterProcessingDetails.addCondition({
+      filter: FILTER_TO_LABEL[fieldFilter.on],
+      field: fieldFilter.field,
+      expected: `${filterValue}`,
+      actual: `${actualValueString}`,
+      operator: `${fieldFilter.operator}`,
+      passed: result,
+    });
+
+    return result;
+  }
+
+  public static sumFilters(
+    summary: {
+      filters: string[];
+      failedFilters: string[];
+      passedFilters: string[];
+    },
+    condition: ICondition,
+    type?: string
+  ) {
+    if (!type) {
+      type = condition.filter;
+    }
+
+    type = type?.toLowerCase();
+
+    if (condition.passed && !summary.passedFilters.includes(type)) {
+      summary.passedFilters.push(type);
+    }
+
+    if (!condition.passed && !summary.failedFilters.includes(type)) {
+      summary.failedFilters.push(type);
+    }
+
+    if (!summary.filters.includes(type)) {
+      summary.filters.push(type);
+    }
+
+    return summary;
+  }
+
+  private parseValue(originValue, parsingValue) {
+    switch (typeof originValue) {
+      case 'number':
+        return Number(parsingValue);
+      case 'string':
+        return String(parsingValue);
+      case 'boolean':
+        return parsingValue === 'true';
+      case 'bigint':
+        return Number(parsingValue);
+      default:
+        return parsingValue;
+    }
+  }
+
+  protected async findAsync<T>(
+    array: T[],
+    predicate: (t: T) => Promise<boolean>
+  ): Promise<T | undefined> {
+    for (const t of array) {
+      if (await predicate(t)) {
+        return t;
+      }
+    }
+
+    return undefined;
+  }
+
+  protected async filterAsync<T>(
+    arr: T[],
+    callback: (item: T) => Promise<boolean>
+  ): Promise<T[]> {
+    const fail = Symbol('Filter Async failure');
+
+    return (
+      await Promise.all(
+        arr.map(async (item) => ((await callback(item)) ? item : fail))
+      )
+    ).filter((i) => i !== fail) as T[];
+  }
+}
diff --git a/packages/node/src/lib/integrations/integrations.interface.ts b/packages/node/src/lib/integrations/integrations.interface.ts
index 3b9087b20d7..f236d6134eb 100644
--- a/packages/node/src/lib/integrations/integrations.interface.ts
+++ b/packages/node/src/lib/integrations/integrations.interface.ts
@@ -1,5 +1,17 @@
-import { ChannelTypeEnum, ICredentialsDto } from '@novu/shared';
+import {
+  BuilderFieldType,
+  BuilderGroupValues,
+  ChannelTypeEnum,
+  FilterParts,
+  ICredentialsDto,
+} from '@novu/shared';
 
+export interface IConditions {
+  isNegated: boolean;
+  type: BuilderFieldType;
+  value: BuilderGroupValues;
+  children: FilterParts[];
+}
 export interface IIntegrations {
   getAll();
   create(providerId: string, data: IIntegrationsPayload);
@@ -21,4 +33,5 @@ export interface IIntegrationsUpdatePayload {
   credentials?: ICredentialsDto;
   active?: boolean;
   check?: boolean;
+  conditions?: IConditions[];
 }
diff --git a/packages/node/src/lib/integrations/integrations.spec.ts b/packages/node/src/lib/integrations/integrations.spec.ts
index bc0151eb3ba..052be65ed21 100644
--- a/packages/node/src/lib/integrations/integrations.spec.ts
+++ b/packages/node/src/lib/integrations/integrations.spec.ts
@@ -37,6 +37,9 @@ describe('test use of novus node package - Integrations class', () => {
       active: true,
       channel: ChannelTypeEnum.EMAIL,
       check: true,
+      conditions: [
+        { isNegated: false, type: 'GROUP', value: 'AND', children: [] },
+      ],
     });
 
     expect(mockedAxios.post).toHaveBeenCalled();
@@ -49,6 +52,9 @@ describe('test use of novus node package - Integrations class', () => {
       active: true,
       channel: ChannelTypeEnum.EMAIL,
       check: true,
+      conditions: [
+        { isNegated: false, type: 'GROUP', value: 'AND', children: [] },
+      ],
     });
   });
 
@@ -82,6 +88,9 @@ describe('test use of novus node package - Integrations class', () => {
         apiKey: 'newApiKey',
         secretKey: 'newApiSecret',
       },
+      conditions: [
+        { isNegated: false, type: 'GROUP', value: 'AND', children: [] },
+      ],
     });
 
     expect(mockedAxios.put).toHaveBeenCalled();
@@ -94,6 +103,9 @@ describe('test use of novus node package - Integrations class', () => {
           apiKey: 'newApiKey',
           secretKey: 'newApiSecret',
         },
+        conditions: [
+          { isNegated: false, type: 'GROUP', value: 'AND', children: [] },
+        ],
       }
     );
   });