diff --git a/Apps/GatewayApi/src/Services/IJobService.cs b/Apps/GatewayApi/src/Services/IJobService.cs
index da07b108ad..a31991e914 100644
--- a/Apps/GatewayApi/src/Services/IJobService.cs
+++ b/Apps/GatewayApi/src/Services/IJobService.cs
@@ -69,6 +69,6 @@ public interface IJobService
         /// <param name="smsVerificationCode">The code used to validate the ownership of the number.</param>
         /// <param name="ct"><see cref="CancellationToken"/> to manage the async request.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task PushNotificationSettingsToPhsaAsync(UserProfile userProfile, string email, string smsNumber, string smsVerificationCode, CancellationToken ct = default);
+        Task PushNotificationSettingsToPhsaAsync(UserProfile userProfile, string? email, string? smsNumber, string? smsVerificationCode = null, CancellationToken ct = default);
     }
 }
diff --git a/Apps/GatewayApi/src/Services/JobService.cs b/Apps/GatewayApi/src/Services/JobService.cs
index 3f813c9a63..81f2b7acfe 100644
--- a/Apps/GatewayApi/src/Services/JobService.cs
+++ b/Apps/GatewayApi/src/Services/JobService.cs
@@ -65,7 +65,7 @@ public async Task SendEmailAsync(string emailAddress, string emailTemplateName,
         }
 
         /// <inheritdoc/>
-        public async Task PushNotificationSettingsToPhsaAsync(UserProfile userProfile, string email, string smsNumber, string smsVerificationCode, CancellationToken ct = default)
+        public async Task PushNotificationSettingsToPhsaAsync(UserProfile userProfile, string? email, string? smsNumber, string? smsVerificationCode = null, CancellationToken ct = default)
         {
             NotificationSettingsRequest notificationSettingsRequest = new(userProfile, email, smsNumber) { SmsVerificationCode = smsVerificationCode };
             await notificationSettingsService.QueueNotificationSettingsAsync(notificationSettingsRequest, ct);
diff --git a/Apps/GatewayApi/src/Services/UserEmailServiceV2.cs b/Apps/GatewayApi/src/Services/UserEmailServiceV2.cs
index f4ade2d2e7..5f5ab80606 100644
--- a/Apps/GatewayApi/src/Services/UserEmailServiceV2.cs
+++ b/Apps/GatewayApi/src/Services/UserEmailServiceV2.cs
@@ -22,10 +22,6 @@ namespace HealthGateway.GatewayApi.Services
     using HealthGateway.Common.Constants;
     using HealthGateway.Common.Data.Constants;
     using HealthGateway.Common.ErrorHandling.Exceptions;
-    using HealthGateway.Common.Messaging;
-    using HealthGateway.Common.Models;
-    using HealthGateway.Common.Models.Events;
-    using HealthGateway.Common.Services;
     using HealthGateway.Database.Constants;
     using HealthGateway.Database.Delegates;
     using HealthGateway.Database.Models;
@@ -39,13 +35,11 @@ public class UserEmailServiceV2 : IUserEmailServiceV2
     {
         private const int MaxVerificationAttempts = 5;
 
-        private readonly IEmailQueueService emailQueueService;
         private readonly ILogger logger;
         private readonly IMessagingVerificationDelegate messageVerificationDelegate;
         private readonly IMessagingVerificationService messagingVerificationService;
-        private readonly INotificationSettingsService notificationSettingsService;
         private readonly IUserProfileDelegate profileDelegate;
-        private readonly IMessageSender messageSender;
+        private readonly IJobService jobService;
         private readonly bool notificationsChangeFeedEnabled;
 
         /// <summary>
@@ -55,27 +49,21 @@ public class UserEmailServiceV2 : IUserEmailServiceV2
         /// <param name="messageVerificationDelegate">The message verification delegate to interact with the DB.</param>
         /// <param name="messagingVerificationService">The messaging verification service.</param>
         /// <param name="profileDelegate">The profile delegate to interact with the DB.</param>
-        /// <param name="emailQueueService">The email service to queue emails.</param>
-        /// <param name="notificationSettingsService">Notification settings delegate.</param>
+        /// <param name="jobService">The injected job service.</param>
         /// <param name="configuration">Configuration settings.</param>
-        /// <param name="messageSender">The message sender.</param>
         public UserEmailServiceV2(
             ILogger<UserEmailServiceV2> logger,
             IMessagingVerificationDelegate messageVerificationDelegate,
             IMessagingVerificationService messagingVerificationService,
             IUserProfileDelegate profileDelegate,
-            IEmailQueueService emailQueueService,
-            INotificationSettingsService notificationSettingsService,
-            IConfiguration configuration,
-            IMessageSender messageSender)
+            IJobService jobService,
+            IConfiguration configuration)
         {
             this.logger = logger;
             this.messageVerificationDelegate = messageVerificationDelegate;
             this.messagingVerificationService = messagingVerificationService;
             this.profileDelegate = profileDelegate;
-            this.emailQueueService = emailQueueService;
-            this.notificationSettingsService = notificationSettingsService;
-            this.messageSender = messageSender;
+            this.jobService = jobService;
             this.notificationsChangeFeedEnabled = configuration.GetSection(ChangeFeedOptions.ChangeFeed).Get<ChangeFeedOptions>()?.Notifications.Enabled ?? false;
         }
 
@@ -159,7 +147,7 @@ public async Task UpdateEmailAddressAsync(string hdid, string emailAddress, Canc
             if (messagingVerification != null)
             {
                 this.logger.LogInformation("Sending new email verification for user {Hdid}", hdid);
-                await this.emailQueueService.QueueNewEmailAsync(messagingVerification.Email, true, ct);
+                await this.jobService.SendEmailAsync(messagingVerification.Email, true, ct);
             }
 
             await this.QueueNotificationSettingsRequest(userProfile, ct);
@@ -196,14 +184,13 @@ private async Task NotifyVerificationSuccessful(string hdid, string emailAddress
         {
             if (this.notificationsChangeFeedEnabled)
             {
-                MessageEnvelope[] events = [new(new NotificationChannelVerifiedEvent(hdid, NotificationChannel.Email, emailAddress), hdid)];
-                await this.messageSender.SendAsync(events, ct);
+                await this.jobService.NotifyEmailVerificationAsync(hdid, emailAddress, ct);
             }
         }
 
         private async Task QueueNotificationSettingsRequest(UserProfile userProfile, CancellationToken ct)
         {
-            await this.notificationSettingsService.QueueNotificationSettingsAsync(new NotificationSettingsRequest(userProfile, userProfile.Email, userProfile.SmsNumber), ct);
+            await this.jobService.PushNotificationSettingsToPhsaAsync(userProfile, userProfile.Email, userProfile.SmsNumber, ct: ct);
         }
     }
 }
diff --git a/Apps/GatewayApi/test/unit/Services.Test/UserEmailServiceV2Tests.cs b/Apps/GatewayApi/test/unit/Services.Test/UserEmailServiceV2Tests.cs
index 1da917d535..472d4b2de6 100644
--- a/Apps/GatewayApi/test/unit/Services.Test/UserEmailServiceV2Tests.cs
+++ b/Apps/GatewayApi/test/unit/Services.Test/UserEmailServiceV2Tests.cs
@@ -18,16 +18,11 @@ namespace HealthGateway.GatewayApiTests.Services.Test
     using System;
     using System.Collections.Generic;
     using System.Globalization;
-    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using HealthGateway.Common.Constants;
     using HealthGateway.Common.Data.Constants;
     using HealthGateway.Common.ErrorHandling.Exceptions;
-    using HealthGateway.Common.Messaging;
-    using HealthGateway.Common.Models;
-    using HealthGateway.Common.Models.Events;
-    using HealthGateway.Common.Services;
     using HealthGateway.Database.Constants;
     using HealthGateway.Database.Delegates;
     using HealthGateway.Database.Models;
@@ -66,7 +61,7 @@ public async Task ShouldVerifyEmailAddress(bool changeFeedEnabled)
             Guid inviteKey = Guid.NewGuid();
             Times expectedNotificationChannelVerifiedEventTimes = ConvertToTimes(changeFeedEnabled);
 
-            VerifyEmailAddressMock mock = SetupVerifyEmailAddressMock(inviteKey, changeFeedEnabled);
+            EmailAddressMock mock = SetupVerifyEmailAddressMock(inviteKey, changeFeedEnabled);
 
             // Act
             bool actual = await mock.Service.VerifyEmailAddressAsync(Hdid, inviteKey, CancellationToken.None);
@@ -76,8 +71,8 @@ public async Task ShouldVerifyEmailAddress(bool changeFeedEnabled)
 
             VerifyVerificationUpdateValidatedTrue(mock.MessagingVerificationDelegateMock);
             VerifyUserProfileUpdate(mock.UserProfileDelegateMock);
-            VerifyQueueNotificationSettings(mock.NotificationSettingsServiceMock);
-            VerifyNotificationChannelVerifiedEvent(mock.MessageSenderMock, expectedNotificationChannelVerifiedEventTimes);
+            VerifyPushNotificationSettingsToPhsa(mock.JobServiceMock);
+            VerifyNotifyEmailVerification(mock.JobServiceMock, expectedNotificationChannelVerifiedEventTimes);
         }
 
         /// <summary>
@@ -186,7 +181,7 @@ public async Task ShouldUpdateEmailAddress(bool latestVerificationExists, string
             Times expectedVerificationInsertTimes = ConvertToTimes(!string.IsNullOrEmpty(emailAddress));
             Times expectedQueueNewEmailByEntityTimes = ConvertToTimes(!string.IsNullOrEmpty(emailAddress));
 
-            UpdateEmailAddressMock mock = SetupUpdateEmailAddressMock(
+            EmailAddressMock mock = SetupUpdateEmailAddressMock(
                 Hdid,
                 latestVerificationExists,
                 emailAddress);
@@ -197,8 +192,8 @@ public async Task ShouldUpdateEmailAddress(bool latestVerificationExists, string
             VerifyVerificationExpire(mock.MessagingVerificationDelegateMock, expectedVerificationExpireTimes);
             VerifyVerificationInsert(mock.MessagingVerificationDelegateMock, expectedVerificationInsertTimes);
             VerifyUserProfileUpdate(mock.UserProfileDelegateMock);
-            VerifyQueueNotificationSettings(mock.NotificationSettingsServiceMock);
-            VerifyQueueNewEmailByEntity(mock.EmailQueueServiceMock, expectedQueueNewEmailByEntityTimes);
+            VerifyPushNotificationSettingsToPhsa(mock.JobServiceMock);
+            VerifySendEmail(mock.JobServiceMock, expectedQueueNewEmailByEntityTimes);
         }
 
         /// <summary>
@@ -239,22 +234,22 @@ private static void VerifyUserProfileUpdate(Mock<IUserProfileDelegate> userProfi
                 times ?? Times.Once());
         }
 
-        private static void VerifyQueueNewEmailByEntity(Mock<IEmailQueueService> emailQueueServiceMock, Times? times = null)
+        private static void VerifySendEmail(Mock<IJobService> jobServiceMock, Times? times = null)
         {
-            emailQueueServiceMock.Verify(
-                v => v.QueueNewEmailAsync(
+            jobServiceMock.Verify(
+                v => v.SendEmailAsync(
                     It.IsAny<Email>(),
                     It.IsAny<bool>(),
                     It.IsAny<CancellationToken>()),
                 times ?? Times.Once());
         }
 
-        private static void VerifyNotificationChannelVerifiedEvent(Mock<IMessageSender> messageSenderMock, Times? times = null)
+        private static void VerifyNotifyEmailVerification(Mock<IJobService> jobServiceMock, Times? times = null)
         {
-            messageSenderMock.Verify(
-                v => v.SendAsync(
-                    It.Is<IEnumerable<MessageEnvelope>>(
-                        envelopes => envelopes.First().Content is NotificationChannelVerifiedEvent),
+            jobServiceMock.Verify(
+                v => v.NotifyEmailVerificationAsync(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
                     It.IsAny<CancellationToken>()),
                 times ?? Times.Once());
         }
@@ -303,11 +298,14 @@ private static void VerifyVerificationUpdateValidatedTrue(Mock<IMessagingVerific
                 times ?? Times.Once());
         }
 
-        private static void VerifyQueueNotificationSettings(Mock<INotificationSettingsService> notificationSettingsServiceMock, Times? times = null)
+        private static void VerifyPushNotificationSettingsToPhsa(Mock<IJobService> jobServiceMock, Times? times = null)
         {
-            notificationSettingsServiceMock.Verify(
-                v => v.QueueNotificationSettingsAsync(
-                    It.IsAny<NotificationSettingsRequest>(),
+            jobServiceMock.Verify(
+                v => v.PushNotificationSettingsToPhsaAsync(
+                    It.IsAny<UserProfile>(),
+                    It.IsAny<string?>(),
+                    It.IsAny<string?>(),
+                    It.IsAny<string?>(),
                     It.IsAny<CancellationToken>()),
                 times ?? Times.Once());
         }
@@ -370,30 +368,24 @@ private static IConfiguration GetConfiguration(bool changeFeedEnabled)
         }
 
         private static IUserEmailServiceV2 GetUserEmailService(
+            Mock<IJobService>? jobServiceMock = null,
             Mock<IMessagingVerificationDelegate>? messagingVerificationDelegateMock = null,
             Mock<IMessagingVerificationService>? messagingVerificationServiceMock = null,
             Mock<IUserProfileDelegate>? userProfileDelegateMock = null,
-            Mock<INotificationSettingsService>? notificationSettingsServiceMock = null,
-            Mock<IMessageSender>? messageSenderMock = null,
-            Mock<IEmailQueueService>? emailQueueServiceMock = null,
             bool changeFeedEnabled = false)
         {
+            jobServiceMock ??= new();
             messagingVerificationDelegateMock ??= new();
             messagingVerificationServiceMock ??= new();
             userProfileDelegateMock ??= new();
-            notificationSettingsServiceMock ??= new();
-            messageSenderMock ??= new();
-            emailQueueServiceMock ??= new();
 
             return new UserEmailServiceV2(
                 new Mock<ILogger<UserEmailServiceV2>>().Object,
                 messagingVerificationDelegateMock.Object,
                 messagingVerificationServiceMock.Object,
                 userProfileDelegateMock.Object,
-                emailQueueServiceMock.Object,
-                notificationSettingsServiceMock.Object,
-                GetConfiguration(changeFeedEnabled),
-                messageSenderMock.Object);
+                jobServiceMock.Object,
+                GetConfiguration(changeFeedEnabled));
         }
 
         private static Mock<IMessagingVerificationDelegate> SetupMessagingVerificationDelegateMock(
@@ -511,27 +503,24 @@ private static Mock<IUserProfileDelegate> SetupUserProfileDelegateMock(
             return userProfileDelegateMock;
         }
 
-        private static VerifyEmailAddressMock SetupVerifyEmailAddressMock(Guid inviteKey, bool changeFeedEnabled)
+        private static EmailAddressMock SetupVerifyEmailAddressMock(Guid inviteKey, bool changeFeedEnabled)
         {
             Mock<IMessagingVerificationDelegate> messagingVerificationDelegateMock =
                 SetupMessagingVerificationDelegateMock(matchingVerificationInviteKey: inviteKey);
             Mock<IUserProfileDelegate> userProfileDelegateMock =
                 SetupUserProfileDelegateMock(dbUpdateStatus: DbStatusCode.Updated);
-            Mock<INotificationSettingsService> notificationSettingsServiceMock = new();
-            Mock<IMessageSender> messageSenderMock = new();
+            Mock<IJobService> jobServiceMock = new();
 
             IUserEmailServiceV2 service = GetUserEmailService(
+                jobServiceMock,
                 messagingVerificationDelegateMock,
                 userProfileDelegateMock: userProfileDelegateMock,
-                notificationSettingsServiceMock: notificationSettingsServiceMock,
-                messageSenderMock: messageSenderMock,
                 changeFeedEnabled: changeFeedEnabled);
 
             return new(
                 service,
-                messageSenderMock,
+                jobServiceMock,
                 messagingVerificationDelegateMock,
-                notificationSettingsServiceMock,
                 userProfileDelegateMock);
         }
 
@@ -545,7 +534,7 @@ private static IUserEmailServiceV2 SetupVerifyEmailAddressTooManyAttemptsMock(Gu
             Mock<IUserProfileDelegate> userProfileDelegateMock = SetupUserProfileDelegateMock();
 
             return GetUserEmailService(
-                messagingVerificationDelegateMock,
+                messagingVerificationDelegateMock: messagingVerificationDelegateMock,
                 userProfileDelegateMock: userProfileDelegateMock);
         }
 
@@ -559,7 +548,7 @@ private static IUserEmailServiceV2 SetupVerifyEmailAddressThrowsAlreadyExistsExc
             Mock<IUserProfileDelegate> userProfileDelegateMock = SetupUserProfileDelegateMock();
 
             return GetUserEmailService(
-                messagingVerificationDelegateMock,
+                messagingVerificationDelegateMock: messagingVerificationDelegateMock,
                 userProfileDelegateMock: userProfileDelegateMock);
         }
 
@@ -578,7 +567,9 @@ private static VerifyEmailAddressInvalidInviteMock SetupVerifyEmailAddressInvali
                     setupLatestVerification: true);
 
             Mock<IUserProfileDelegate> userProfileDelegateMock = SetupUserProfileDelegateMock();
-            IUserEmailServiceV2 service = GetUserEmailService(messagingVerificationDelegateMock, userProfileDelegateMock: userProfileDelegateMock);
+            IUserEmailServiceV2 service = GetUserEmailService(
+                messagingVerificationDelegateMock: messagingVerificationDelegateMock,
+                userProfileDelegateMock: userProfileDelegateMock);
             return new(service, messagingVerificationDelegateMock);
         }
 
@@ -590,11 +581,11 @@ private static IUserEmailServiceV2 SetupVerifyEmailAddressThrowsDatabaseExceptio
                 SetupUserProfileDelegateMock(dbUpdateStatus: DbStatusCode.Error); // This will cause a DatabaseException to be thrown.
 
             return GetUserEmailService(
-                messagingVerificationDelegateMock,
+                messagingVerificationDelegateMock: messagingVerificationDelegateMock,
                 userProfileDelegateMock: userProfileDelegateMock);
         }
 
-        private static UpdateEmailAddressMock SetupUpdateEmailAddressMock(
+        private static EmailAddressMock SetupUpdateEmailAddressMock(
             string hdid,
             bool latestVerificationExists,
             string? emailAddress,
@@ -608,8 +599,7 @@ private static UpdateEmailAddressMock SetupUpdateEmailAddressMock(
                     latestVerificationEmailAddress: MainEmailAddress);
 
             Mock<IUserProfileDelegate> userProfileDelegateMock = SetupUserProfileDelegateMock(dbUpdateStatus: updateProfileStatus);
-            Mock<IEmailQueueService> emailQueueServiceMock = new();
-            Mock<INotificationSettingsService> notificationSettingsServiceMock = new();
+            Mock<IJobService> jobServiceMock = new();
 
             Mock<IMessagingVerificationService>? messagingVerificationServiceMock = null;
             if (!string.IsNullOrWhiteSpace(emailAddress))
@@ -620,17 +610,15 @@ private static UpdateEmailAddressMock SetupUpdateEmailAddressMock(
             }
 
             IUserEmailServiceV2 service = GetUserEmailService(
+                jobServiceMock,
                 messagingVerificationDelegateMock,
                 messagingVerificationServiceMock,
-                userProfileDelegateMock,
-                notificationSettingsServiceMock,
-                emailQueueServiceMock: emailQueueServiceMock);
+                userProfileDelegateMock);
 
             return new(
                 service,
-                emailQueueServiceMock,
+                jobServiceMock,
                 messagingVerificationDelegateMock,
-                notificationSettingsServiceMock,
                 userProfileDelegateMock);
         }
 
@@ -644,34 +632,24 @@ private static IUserEmailServiceV2 SetupUpdateEmailAddressThrowsExceptionMock(
                     setupLatestVerification: true);
 
             Mock<IUserProfileDelegate> userProfileDelegateMock = SetupUserProfileDelegateMock(userProfileExists, updateProfileStatus);
-            Mock<IEmailQueueService> emailQueueServiceMock = new();
-            Mock<INotificationSettingsService> notificationSettingsServiceMock = new();
+            Mock<IJobService> jobServiceMock = new();
             Mock<IMessagingVerificationService> messagingVerificationServiceMock = new();
 
             return GetUserEmailService(
+                jobServiceMock,
                 messagingVerificationDelegateMock,
                 messagingVerificationServiceMock,
-                userProfileDelegateMock,
-                notificationSettingsServiceMock,
-                emailQueueServiceMock: emailQueueServiceMock);
+                userProfileDelegateMock);
         }
 
-        private sealed record VerifyEmailAddressMock(
+        private sealed record EmailAddressMock(
             IUserEmailServiceV2 Service,
-            Mock<IMessageSender> MessageSenderMock,
+            Mock<IJobService> JobServiceMock,
             Mock<IMessagingVerificationDelegate> MessagingVerificationDelegateMock,
-            Mock<INotificationSettingsService> NotificationSettingsServiceMock,
             Mock<IUserProfileDelegate> UserProfileDelegateMock);
 
         private sealed record VerifyEmailAddressInvalidInviteMock(
             IUserEmailServiceV2 Service,
             Mock<IMessagingVerificationDelegate> MessagingVerificationDelegateMock);
-
-        private sealed record UpdateEmailAddressMock(
-            IUserEmailServiceV2 Service,
-            Mock<IEmailQueueService> EmailQueueServiceMock,
-            Mock<IMessagingVerificationDelegate> MessagingVerificationDelegateMock,
-            Mock<INotificationSettingsService> NotificationSettingsServiceMock,
-            Mock<IUserProfileDelegate> UserProfileDelegateMock);
     }
 }