diff --git a/.claude/skills/convert-email-mjml/SKILL.md b/.claude/skills/convert-email-mjml/SKILL.md
new file mode 100644
index 000000000000..64643264bf8f
--- /dev/null
+++ b/.claude/skills/convert-email-mjml/SKILL.md
@@ -0,0 +1,488 @@
+---
+name: convert-email-mjml
+description: Convert a Handlebars email template to MJML format. Handles conversion, compilation, and artifact placement.
+disable-model-invocation: false
+user-invocable:true
+---
+
+# Handlebars-to-MJML Email Conversion
+
+Convert an existing Handlebars email template to the new MJML-based email system.
+
+## Input
+
+The user will provide a path to an existing Handlebars email template:
+- Example: `src/Core/MailTemplates/Handlebars/Billing/SomeEmail.html.hbs`
+- Or they may just provide the template name
+
+The path provided is: **$ARGUMENTS**
+
+## Required Context
+
+Before starting, read these files to understand the conversion process:
+
+1. **@docs/plans/email-migrations/handlebars-to-mjml-transition.md** - Complete conversion guide
+2. **@src/Core/MailTemplates/Mjml/README.md** - MJML build process and structure
+
+## Conversion Process
+
+### Step 1: Read and Analyze the Original Template
+
+- Read the original Handlebars template
+- Identify which layout partial it uses (`FullHtmlLayout`, `ProviderFull`, etc.)
+- Extract all Handlebars variables (e.g., `{{Url}}`, `{{Name}}`)
+- Identify conditional logic (`{{#if}}`, `{{#unless}}`, `{{#each}}`)
+- Note any custom Handlebars helpers used (`eq`, `date`, `usd`, etc.)
+
+### Step 2: Convert to MJML
+
+Follow the mapping guide from the transition doc:
+
+**Basic Structure:**
+```xml
+<mjml>
+  <mj-head>
+    <mj-include path="../../components/head.mjml" />
+  </mj-head>
+
+  <mj-body>
+    <mj-include path="../../components/logo.mjml" />
+
+    <mj-wrapper background-color="#fff" border="1px solid #e9e9e9"
+                css-class="border-fix" padding="0">
+      <mj-section>
+        <mj-column>
+          <!-- Template content here -->
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+
+    <mj-wrapper>
+      <mj-bw-learn-more-footer />
+    </mj-wrapper>
+
+    <mj-include path="../../components/footer.mjml" />
+  </mj-body>
+</mjml>
+```
+
+**Key Conversions:**
+- `{{#>FullHtmlLayout}}` → Standard MJML skeleton with `mj-include` for logo
+- `{{#>ProviderFull}}` → Use `<mj-bw-simple-hero />` or `<mj-bw-hero />` instead of logo
+- Table rows → `<mj-section>` + `<mj-column>` + `<mj-text>`
+- Inline-styled `<a>` buttons → `<mj-button href="...">`
+- `<br />` spacers → `<mj-spacer height="Xpx" />` or padding attributes
+
+**Default Styles (do NOT copy from Handlebars):**
+`head.mjml` already sets these globally — do not add them as explicit attributes on `<mj-text>` or other elements unless you are intentionally overriding the default:
+- `font-family`: `'Helvetica Neue', Helvetica, Arial, sans-serif`
+- `font-size`: `16px`
+- `color` (text): `#1B2029`
+- `mj-button` background: `#175ddc`
+
+Only add explicit style attributes when the value differs from these defaults.
+
+**Handlebars Logic:**
+- Simple variables inside content → Leave as-is (e.g., `{{Name}}`, `{{{Url}}}`)
+- Conditionals wrapping MJML tags → Wrap with `<mj-raw>{{#if ...}}</mj-raw>` and `<mj-raw>{{/if}}</mj-raw>`
+- Conditionals inside text → Place directly in `<mj-text>` content
+
+**File Location:**
+- Original: `src/Core/MailTemplates/Handlebars/{Category}/{EmailName}.html.hbs`
+- New MJML: `src/Core/MailTemplates/Mjml/emails/{Category}/{EmailName}.mjml`
+
+Write the new MJML file to the correct location.
+
+### Step 3: Compile and Test
+
+1. **Compile MJML to HTML:**
+   ```bash
+   cd src/Core/MailTemplates/Mjml
+   npm run build:hbs
+   ```
+
+2. **Verify compilation:**
+   - Check that compilation succeeded with no errors
+   - Read the output file: `src/Core/MailTemplates/Mjml/out/{Category}/{EmailName}.html.hbs`
+   - Verify all Handlebars expressions are preserved (e.g., `{{{Url}}}`, `{{#if}}`)
+   - Confirm responsive media queries are generated
+   - Check email client compatibility code (Outlook VML) is included
+
+### Step 4: Locate the ViewModel
+
+Find the corresponding C# ViewModel class:
+
+1. Search for files matching the email name pattern:
+   ```bash
+   find src/Core -name "*{EmailName}*Model.cs"
+   ```
+
+2. Or search for references to the email template:
+   ```bash
+   grep -r "{EmailName}" src/Core --include="*.cs"
+   ```
+
+3. The ViewModel is typically located at:
+   - `src/Core/Models/Mail/{Category}/{EmailName}Model.cs`
+
+### Step 5: Create Folder and Copy Compiled Artifact
+
+Each new MJML-based email gets its **own dedicated subfolder** alongside the ViewModel (following the pattern of `Billing/Renewal/Premium/`, `Billing/Renewal/Families2019Renewal/`, etc.).
+
+1. **Create the subfolder:**
+   ```
+   src/Core/Models/Mail/{Category}/{EmailName}/
+   ```
+
+2. **Copy the compiled artifact** and rename it to match the View class name:
+   - **From:** `src/Core/MailTemplates/Mjml/out/{Category}/{EmailName}.html.hbs`
+   - **To:** `src/Core/Models/Mail/{Category}/{EmailName}/{EmailName}MailView.html.hbs`
+
+3. **Move the existing text template** to the same folder, renamed to match the View class:
+   - **From:** `src/Core/MailTemplates/Handlebars/{Category}/{EmailName}.text.hbs`
+   - **To:** `src/Core/Models/Mail/{Category}/{EmailName}/{EmailName}MailView.text.hbs`
+   - **Do NOT modify its content** — copy it exactly as-is; text templates are hand-authored and not generated
+
+The folder and all three files (`.cs`, `.html.hbs`, `.text.hbs`) must share the same directory so the `IMailer` system can discover the templates at runtime.
+
+### Step 6: Migrate from HandlebarsMailService to IMailer
+
+After the MJML template is created, you must migrate any code that uses the old `IMailService` / `HandlebarsMailService` to the new `IMailer` approach.
+
+#### Step 6.1: Identify the Old Mail Service Method
+
+Search for the method in `HandlebarsMailService` (or `IMailService` interface) that sends this email:
+
+```bash
+grep -n "Send.*{EmailName}" src/Core/Platform/Mail/IMailService.cs
+grep -n "Send.*{EmailName}" src/Core/Platform/Mail/HandlebarsMailService.cs
+```
+
+**Example:** For `BusinessUnitConversionInvite`, the method is:
+```csharp
+// In IMailService.cs
+Task SendBusinessUnitConversionInviteAsync(Organization organization, string token, string email);
+
+// In HandlebarsMailService.cs (line ~1160)
+public async Task SendBusinessUnitConversionInviteAsync(Organization organization, string token, string email)
+{
+    var message = CreateDefaultMessage("Set Up Business Unit", email);
+    var model = new BusinessUnitConversionInviteModel
+    {
+        WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
+        SiteName = _globalSettings.SiteName,
+        OrganizationId = organization.Id.ToString(),
+        Email = WebUtility.UrlEncode(email),
+        Token = WebUtility.UrlEncode(token)
+    };
+    await AddMessageContentAsync(message, "Billing.BusinessUnitConversionInvite", model);
+    message.Category = "BusinessUnitConversionInvite";
+    await _mailDeliveryService.SendEmailAsync(message);
+}
+```
+
+#### Step 6.2: Update the ViewModel and Create the Mail Class
+
+The old ViewModel inherits from `BaseMailModel`. Update it to inherit from `BaseMailView` and add the Mail class in the **same file** (following the pattern in `BaseMail.cs`):
+
+**Before:**
+```csharp
+using Bit.Core.Models.Mail;
+
+namespace Bit.Core.Models.Mail.Billing;
+
+public class BusinessUnitConversionInviteModel : BaseMailModel
+{
+    public string OrganizationId { get; set; }
+    public string Email { get; set; }
+    public string Token { get; set; }
+
+    public string Url =>
+        $"{WebVaultUrl}/providers/setup-business-unit?organizationId={OrganizationId}&email={Email}&token={Token}";
+}
+```
+
+**After (both classes in one file, new subfolder):**
+```csharp
+using Bit.Core.Platform.Mail.Mailer;
+
+namespace Bit.Core.Models.Mail.Billing.BusinessUnitConversionInvite;
+
+#nullable enable
+
+/// <summary>
+/// Email sent to invite users to set up a Business Unit Portal.
+/// </summary>
+public class BusinessUnitConversionInviteMail : BaseMail<BusinessUnitConversionInviteMailView>
+{
+    public override string Subject { get; set; } = "Set Up Business Unit";
+}
+
+/// <summary>
+/// View model for Business Unit Conversion Invite email template.
+/// </summary>
+public class BusinessUnitConversionInviteMailView : BaseMailView
+{
+    public required string OrganizationId { get; init; }
+    public required string Email { get; init; }
+    public required string Token { get; init; }
+    public required string WebVaultUrl { get; init; }
+
+    public string Url =>
+        $"{WebVaultUrl}/providers/setup-business-unit?organizationId={OrganizationId}&email={Email}&token={Token}";
+}
+```
+
+**Key changes:**
+- **New dedicated subfolder**: `src/Core/Models/Mail/{Category}/{EmailName}/` (e.g., `Billing/BusinessUnitConversionInvite/`)
+- **Both classes in the same file** (follows existing Renewal email pattern)
+- **View class name** uses `*MailView` suffix (e.g., `BusinessUnitConversionInviteMailView`)
+- **Namespace** includes the subfolder (e.g., `Bit.Core.Models.Mail.Billing.BusinessUnitConversionInvite`)
+- View inherits from `BaseMailView` instead of `BaseMailModel`
+- Enable nullable reference types (`#nullable enable`)
+- Properties use `required` and `init` for immutability
+- `WebVaultUrl` is now a required property (no longer inherited from BaseMailModel)
+- Remove `SiteName` if not used (BaseMailView only provides `CurrentYear`)
+- Mail class defines `Subject` (Category is optional — only add if the old method set one explicitly)
+
+**File location:**
+- Old: `src/Core/Models/Mail/Billing/BusinessUnitConversionInviteModel.cs`
+- New: `src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.cs`
+
+#### Step 6.3: Place Template Files in the New Subfolder
+
+Template files must match the **View class name** and live in the **same subfolder** as the `.cs` file:
+
+```
+src/Core/Models/Mail/{Category}/{EmailName}/
+├── {EmailName}MailView.cs
+├── {EmailName}MailView.html.hbs   ← compiled MJML artifact (renamed)
+└── {EmailName}MailView.text.hbs   ← copied from Handlebars source
+```
+
+This is exactly what Step 5 produces. If Step 5 was followed, no additional renaming is needed here.
+
+#### Step 6.4: Find and Replace All Invocations
+
+Search for all places where the old mail service method is called:
+
+```bash
+grep -rn "SendBusinessUnitConversionInviteAsync" src/ --include="*.cs"
+```
+
+**Old approach (HandlebarsMailService):**
+```csharp
+public class SomeService
+{
+    private readonly IMailService _mailService;
+
+    public SomeService(IMailService mailService)
+    {
+        _mailService = mailService;
+    }
+
+    public async Task InviteToBusinessUnit(Organization org, string email, string token)
+    {
+        await _mailService.SendBusinessUnitConversionInviteAsync(org, token, email);
+    }
+}
+```
+
+**New approach (IMailer):**
+```csharp
+using Bit.Core.Platform.Mail.Mailer;
+using Bit.Core.Models.Mail.Billing;
+using System.Net;
+
+public class SomeService
+{
+    private readonly IMailer _mailer;
+    private readonly IGlobalSettings _globalSettings;
+
+    public SomeService(IMailer mailer, IGlobalSettings globalSettings)
+    {
+        _mailer = mailer;
+        _globalSettings = globalSettings;
+    }
+
+    public async Task InviteToBusinessUnit(Organization org, string email, string token)
+    {
+        var mail = new BusinessUnitConversionInviteMail
+        {
+            ToEmails = [email],
+            View = new BusinessUnitConversionInviteView
+            {
+                OrganizationId = org.Id.ToString(),
+                Email = WebUtility.UrlEncode(email),
+                Token = WebUtility.UrlEncode(token),
+                WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash
+            }
+        };
+
+        await _mailer.SendEmail(mail);
+    }
+}
+```
+
+**Key differences:**
+- Inject `IMailer` instead of `IMailService`
+- Inject `IGlobalSettings` to get `WebVaultUrl` (no longer on ViewModel base class)
+- Create mail object with `ToEmails` and `View` properties
+- Call `_mailer.SendEmail(mail)` instead of `_mailService.Send*Async(...)`
+- ViewModel instantiation is explicit (better type safety)
+
+#### Step 6.5: Update Dependency Injection
+
+Ensure the consuming service has access to `IMailer`. In most cases, this is already registered globally.
+
+If not registered, add to `ServiceCollectionExtensions.cs`:
+```csharp
+services.AddMailer(); // Registers IMailer and IMailRenderer
+```
+
+#### Step 6.6: Remove or Deprecate Old Method
+
+Once all invocations are migrated:
+
+1. **Mark the old method as obsolete** in `IMailService`:
+   ```csharp
+   [Obsolete("Use IMailer with BusinessUnitConversionInviteMail instead")]
+   Task SendBusinessUnitConversionInviteAsync(Organization organization, string token, string email);
+   ```
+
+2. **Do NOT delete** the method from `HandlebarsMailService` yet—it may be in use by other environments
+3. File a follow-up task to remove the method after a deprecation period
+
+#### Step 6.7: Update Tests
+
+Find all tests for services that were updated in Step 6.4 and replace `IMailService` mocks with `IMailer` mocks.
+
+**Find affected test files:**
+```bash
+grep -rn "Send{EmailName}Async\|IMailService" test/ --include="*.cs" -l
+```
+
+**Old test pattern (mocking IMailService):**
+```csharp
+public class SomeServiceTests
+{
+    private readonly IMailService _mailService;
+    private readonly SomeService _sut;
+
+    public SomeServiceTests()
+    {
+        _mailService = Substitute.For<IMailService>();
+        _sut = new SomeService(_mailService);
+    }
+
+    [Fact]
+    public async Task InviteToBusinessUnit_SendsEmail()
+    {
+        // Act
+        await _sut.InviteToBusinessUnit(org, email, token);
+
+        // Assert
+        await _mailService.Received(1)
+            .SendBusinessUnitConversionInviteAsync(org, token, email);
+    }
+}
+```
+
+**New test pattern (mocking IMailer):**
+```csharp
+public class SomeServiceTests
+{
+    private readonly IMailer _mailer;
+    private readonly IGlobalSettings _globalSettings;
+    private readonly SomeService _sut;
+
+    public SomeServiceTests()
+    {
+        _mailer = Substitute.For<IMailer>();
+        _globalSettings = Substitute.For<IGlobalSettings>();
+        _sut = new SomeService(_mailer, _globalSettings);
+    }
+
+    [Fact]
+    public async Task InviteToBusinessUnit_SendsEmail()
+    {
+        // Arrange
+        var vaultUrl = "https://vault.example.com/#";
+        _globalSettings.BaseServiceUri.VaultWithHash.Returns(vaultUrl);
+
+        // Act
+        await _sut.InviteToBusinessUnit(org, email, token);
+
+        // Assert
+        await _mailer.Received(1).SendEmail(
+            Arg.Is<BusinessUnitConversionInviteMail>(m =>
+                m.ToEmails.Contains(email) &&
+                m.View.OrganizationId == org.Id.ToString() &&
+                m.View.WebVaultUrl == vaultUrl));
+    }
+}
+```
+
+**Key changes in tests:**
+- Replace `IMailService` field and constructor arg with `IMailer`
+- Add `IGlobalSettings` mock if the service now requires it (set up `VaultWithHash` return value)
+- Replace `Received(1).SendXxxAsync(...)` with `Received(1).SendEmail(Arg.Is<XxxMail>(...))`
+- Use `Arg.Is<>` to assert the `ToEmails` list and critical `View` properties
+- Update `using` directives: add the new mail namespace, remove old `IMailService` import if no longer used
+- If the test class uses AutoFixture/`[Theory]` with `[BitAutoData]`, update `[Frozen]` attributes accordingly:
+  ```csharp
+  // Old
+  [BitAutoData] SutProvider<SomeService> sutProvider, ...
+  // sutProvider.GetDependency<IMailService>().Received(1).SendXxxAsync(...)
+
+  // New
+  [BitAutoData] SutProvider<SomeService> sutProvider, ...
+  // sutProvider.GetDependency<IMailer>().Received(1).SendEmail(Arg.Is<XxxMail>(...))
+  ```
+
+### Step 7: Verification Checklist
+
+Confirm the following before completing:
+
+- [ ] MJML file created in correct location under `emails/` directory
+- [ ] All Handlebars variables from original template are preserved
+- [ ] Conditional logic (`{{#if}}`, `{{#unless}}`, `{{#each}}`) is properly wrapped with `<mj-raw>` where needed
+- [ ] Custom helpers (`eq`, `date`, `usd`) are used identically to original
+- [ ] MJML compilation completed with no errors
+- [ ] Compiled `.html.hbs` contains Handlebars expressions intact
+- [ ] Compiled artifact copied to location next to ViewModel
+- [ ] ViewModel location identified and confirmed
+- [ ] ViewModel updated to inherit from `BaseMailView`
+- [ ] Mail class created inheriting from `BaseMail<TView>`
+- [ ] Template files renamed to match View class name
+- [ ] All invocations of old mail service method migrated to IMailer
+- [ ] Tests updated: `IMailService` mocks replaced with `IMailer`, assertions updated to `SendEmail(Arg.Is<XxxMail>(...))`
+- [ ] Old method marked as obsolete (if appropriate)
+
+## Output Summary
+
+Provide a clear summary including:
+
+1. **Original template**: Full path to source Handlebars file
+2. **New MJML file**: Location of created MJML source
+3. **Compiled output**: Location of `.html.hbs` artifact
+4. **ViewModel**: Location of associated ViewModel class
+5. **Key conversions**: Summary of major structural changes
+6. **Variables preserved**: List of Handlebars expressions carried over
+7. **Next steps**: Any manual testing or integration work needed
+
+## Important Notes
+
+- **Do NOT create or modify text email templates** (`.text.hbs` files) — they are hand-authored separately; only copy the existing one to the new location
+- **Do NOT copy inline styles from Handlebars templates**: `head.mjml` defines global defaults (`font-size: 16px`, `color: #1B2029`, `font-family`). Use plain `<mj-text>` without style attributes unless overriding a default.
+- **Triple-stash URLs**: Always use `{{{Url}}}` for URLs to prevent HTML encoding
+- **Validation level**: Build uses `strict` validation; `mj-raw` must be in legal positions
+- **No backwards compatibility needed**: This is a new pipeline, not a replacement
+- **Style inheritance**: Most styles come from `head.mjml` - only override what differs
+
+## Reference Files
+
+- Conversion guide: `docs/plans/email-migrations/handlebars-to-mjml-transition.md`
+- MJML README: `src/Core/MailTemplates/Mjml/README.md`
+- Platform Mail README: `src/Core/Platform/Mail/README.md`
+- MailTemplates README: `src/Core/MailTemplates/README.md`
diff --git a/.claude/skills/convert-email-mjml/template.mjml b/.claude/skills/convert-email-mjml/template.mjml
new file mode 100644
index 000000000000..36f595749cdb
--- /dev/null
+++ b/.claude/skills/convert-email-mjml/template.mjml
@@ -0,0 +1,64 @@
+<mjml>
+  <mj-head>
+    <mj-include path="../../components/head.mjml" />
+  </mj-head>
+
+  <mj-body>
+    <!-- For standard emails with logo -->
+    <mj-include path="../../components/logo.mjml" />
+
+    <!-- For Provider emails with blue header, use instead: -->
+    <!-- <mj-bw-simple-hero /> -->
+    <!-- OR -->
+    <!-- <mj-bw-hero /> -->
+
+    <!-- Main content area -->
+    <mj-wrapper background-color="#fff" border="1px solid #e9e9e9"
+                css-class="border-fix" padding="0">
+      <mj-section>
+        <mj-column>
+
+          <!-- Text blocks -->
+          <mj-text padding="0 0 10px">
+            Your text content here with {{HandlebarsVariables}}
+          </mj-text>
+
+          <!-- Conditional text (inside mj-text, no mj-raw needed) -->
+          <mj-text>
+            {{#if SomeCondition}}
+              Conditional text here
+            {{else}}
+              Alternative text
+            {{/if}}
+          </mj-text>
+
+          <!-- Buttons -->
+          <mj-button href="{{{Url}}}" border-radius="5px">
+            Button Text
+          </mj-button>
+
+        </mj-column>
+      </mj-section>
+
+      <!-- Conditional structural elements (wrap with mj-raw) -->
+      <mj-raw>{{#unless SomeCondition}}</mj-raw>
+      <mj-section>
+        <mj-column>
+          <mj-text>
+            This entire section is conditional
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-raw>{{/unless}}</mj-raw>
+
+    </mj-wrapper>
+
+    <!-- Learn More footer -->
+    <mj-wrapper>
+      <mj-bw-learn-more-footer />
+    </mj-wrapper>
+
+    <!-- Standard footer -->
+    <mj-include path="../../components/footer.mjml" />
+  </mj-body>
+</mjml>
diff --git a/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs
index 12d370395cb2..387015443115 100644
--- a/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs
+++ b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs
@@ -13,8 +13,12 @@
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
+using Bit.Core.Models.Mail.Provider.ProviderUpdatePaymentMethod;
+using Bit.Core.Platform.Mail.Mailer;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Bit.Core.Settings;
+using Bit.Core.Utilities;
 using Stripe;
 
 namespace Bit.Commercial.Core.AdminConsole.Providers;
@@ -22,7 +26,8 @@ namespace Bit.Commercial.Core.AdminConsole.Providers;
 public class RemoveOrganizationFromProviderCommand : IRemoveOrganizationFromProviderCommand
 {
     private readonly IEventService _eventService;
-    private readonly IMailService _mailService;
+    private readonly IMailer _mailer;
+    private readonly IGlobalSettings _globalSettings;
     private readonly IOrganizationRepository _organizationRepository;
     private readonly IProviderOrganizationRepository _providerOrganizationRepository;
     private readonly IStripeAdapter _stripeAdapter;
@@ -34,7 +39,8 @@ public class RemoveOrganizationFromProviderCommand : IRemoveOrganizationFromProv
 
     public RemoveOrganizationFromProviderCommand(
         IEventService eventService,
-        IMailService mailService,
+        IMailer mailer,
+        IGlobalSettings globalSettings,
         IOrganizationRepository organizationRepository,
         IProviderOrganizationRepository providerOrganizationRepository,
         IStripeAdapter stripeAdapter,
@@ -45,7 +51,8 @@ public RemoveOrganizationFromProviderCommand(
         IPricingClient pricingClient)
     {
         _eventService = eventService;
-        _mailService = mailService;
+        _mailer = mailer;
+        _globalSettings = globalSettings;
         _organizationRepository = organizationRepository;
         _providerOrganizationRepository = providerOrganizationRepository;
         _stripeAdapter = stripeAdapter;
@@ -176,10 +183,16 @@ private async Task ResetOrganizationBillingAsync(
             await _subscriberService.RemovePaymentSource(organization);
         }
 
-        await _mailService.SendProviderUpdatePaymentMethod(
-            organization.Id,
-            organization.Name,
-            provider.Name!,
-            organizationOwnerEmails);
+        await _mailer.SendEmail(new ProviderUpdatePaymentMethodMail
+        {
+            ToEmails = organizationOwnerEmails,
+            View = new ProviderUpdatePaymentMethodMailView
+            {
+                OrganizationId = organization.Id.ToString(),
+                OrganizationName = CoreHelpers.SanitizeForEmail(organization.Name),
+                ProviderName = CoreHelpers.SanitizeForEmail(provider.Name!),
+                WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash
+            }
+        });
     }
 }
diff --git a/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs b/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs
index 07420c895e81..03e81f42cfa0 100644
--- a/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs
+++ b/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs
@@ -15,8 +15,9 @@
 using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
+using Bit.Core.Models.Mail.Billing.BusinessUnitConversionInvite;
+using Bit.Core.Platform.Mail.Mailer;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.DataProtection;
@@ -30,7 +31,7 @@ public class BusinessUnitConverter(
     IDataProtectionProvider dataProtectionProvider,
     GlobalSettings globalSettings,
     ILogger<BusinessUnitConverter> logger,
-    IMailService mailService,
+    IMailer mailer,
     IOrganizationRepository organizationRepository,
     IOrganizationUserRepository organizationUserRepository,
     IPricingClient pricingClient,
@@ -319,7 +320,19 @@ private async Task SendInviteAsync(
         var token = _dataProtector.Protect(
             $"BusinessUnitConversionInvite {organization.Id} {providerAdminEmail} {CoreHelpers.ToEpocMilliseconds(DateTime.UtcNow)}");
 
-        await mailService.SendBusinessUnitConversionInviteAsync(organization, token, providerAdminEmail);
+        var mail = new BusinessUnitConversionInviteMail
+        {
+            ToEmails = [providerAdminEmail],
+            View = new BusinessUnitConversionInviteMailView
+            {
+                OrganizationId = organization.Id.ToString(),
+                Email = System.Net.WebUtility.UrlEncode(providerAdminEmail),
+                Token = System.Net.WebUtility.UrlEncode(token),
+                WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash
+            }
+        };
+
+        await mailer.SendEmail(mail);
     }
 
     private async Task<(Subscription, Provider, ProviderOrganization, ProviderUser)> ValidateFinalizationAsync(
diff --git a/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs
index 810429d65885..241ab0bcdfb5 100644
--- a/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs
+++ b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs
@@ -11,6 +11,8 @@
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
+using Bit.Core.Models.Mail.Provider.ProviderUpdatePaymentMethod;
+using Bit.Core.Platform.Mail.Mailer;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Test.Billing.Mocks;
@@ -123,12 +125,9 @@ await sutProvider.GetDependency<IProviderOrganizationRepository>().Received(1)
         await sutProvider.GetDependency<IEventService>().Received(1)
             .LogProviderOrganizationEventAsync(providerOrganization, EventType.ProviderOrganization_Removed);
 
-        await sutProvider.GetDependency<IMailService>().Received(1)
-            .SendProviderUpdatePaymentMethod(
-                organization.Id,
-                organization.Name,
-                provider.Name,
-                Arg.Is<IEnumerable<string>>(emails => emails.FirstOrDefault() == "a@example.com"));
+        await sutProvider.GetDependency<IMailer>().Received(1)
+            .SendEmail(Arg.Is<ProviderUpdatePaymentMethodMail>(mail =>
+                mail.ToEmails.FirstOrDefault() == "a@example.com"));
 
         await sutProvider.GetDependency<IStripeAdapter>().DidNotReceiveWithAnyArgs()
             .UpdateCustomerAsync(Arg.Any<string>(), Arg.Any<CustomerUpdateOptions>());
@@ -186,12 +185,9 @@ await sutProvider.GetDependency<IProviderOrganizationRepository>().Received(1)
         await sutProvider.GetDependency<IEventService>().Received(1)
             .LogProviderOrganizationEventAsync(providerOrganization, EventType.ProviderOrganization_Removed);
 
-        await sutProvider.GetDependency<IMailService>().Received(1)
-            .SendProviderUpdatePaymentMethod(
-                organization.Id,
-                organization.Name,
-                provider.Name,
-                Arg.Is<IEnumerable<string>>(emails => emails.FirstOrDefault() == "a@example.com"));
+        await sutProvider.GetDependency<IMailer>().Received(1)
+            .SendEmail(Arg.Is<ProviderUpdatePaymentMethodMail>(mail =>
+                mail.ToEmails.FirstOrDefault() == "a@example.com"));
     }
 
     [Theory, BitAutoData]
@@ -275,12 +271,9 @@ await sutProvider.GetDependency<IProviderOrganizationRepository>().Received(1)
         await sutProvider.GetDependency<IEventService>().Received(1)
             .LogProviderOrganizationEventAsync(providerOrganization, EventType.ProviderOrganization_Removed);
 
-        await sutProvider.GetDependency<IMailService>().Received(1)
-            .SendProviderUpdatePaymentMethod(
-                organization.Id,
-                organization.Name,
-                provider.Name,
-                Arg.Is<IEnumerable<string>>(emails => emails.FirstOrDefault() == "a@example.com"));
+        await sutProvider.GetDependency<IMailer>().Received(1)
+            .SendEmail(Arg.Is<ProviderUpdatePaymentMethodMail>(mail =>
+                mail.ToEmails.FirstOrDefault() == "a@example.com"));
     }
 
     [Theory, BitAutoData]
@@ -364,12 +357,9 @@ await sutProvider.GetDependency<IProviderOrganizationRepository>().Received(1)
         await sutProvider.GetDependency<IEventService>().Received(1)
             .LogProviderOrganizationEventAsync(providerOrganization, EventType.ProviderOrganization_Removed);
 
-        await sutProvider.GetDependency<IMailService>().Received(1)
-            .SendProviderUpdatePaymentMethod(
-                organization.Id,
-                organization.Name,
-                provider.Name,
-                Arg.Is<IEnumerable<string>>(emails => emails.FirstOrDefault() == "a@example.com"));
+        await sutProvider.GetDependency<IMailer>().Received(1)
+            .SendEmail(Arg.Is<ProviderUpdatePaymentMethodMail>(mail =>
+                mail.ToEmails.FirstOrDefault() == "a@example.com"));
     }
 
     private static Subscription GetSubscription(string subscriptionId, string customerId) =>
diff --git a/bitwarden_license/test/Commercial.Core.Test/Billing/Providers/Services/BusinessUnitConverterTests.cs b/bitwarden_license/test/Commercial.Core.Test/Billing/Providers/Services/BusinessUnitConverterTests.cs
index 48b971a032a8..ecaafb00051b 100644
--- a/bitwarden_license/test/Commercial.Core.Test/Billing/Providers/Services/BusinessUnitConverterTests.cs
+++ b/bitwarden_license/test/Commercial.Core.Test/Billing/Providers/Services/BusinessUnitConverterTests.cs
@@ -15,8 +15,9 @@
 using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
+using Bit.Core.Models.Mail.Billing.BusinessUnitConversionInvite;
+using Bit.Core.Platform.Mail.Mailer;
 using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Test.Billing.Mocks;
 using Bit.Core.Utilities;
@@ -34,7 +35,7 @@ public class BusinessUnitConverterTests
     private readonly IDataProtectionProvider _dataProtectionProvider = Substitute.For<IDataProtectionProvider>();
     private readonly GlobalSettings _globalSettings = new();
     private readonly ILogger<BusinessUnitConverter> _logger = Substitute.For<ILogger<BusinessUnitConverter>>();
-    private readonly IMailService _mailService = Substitute.For<IMailService>();
+    private readonly IMailer _mailer = Substitute.For<IMailer>();
     private readonly IOrganizationRepository _organizationRepository = Substitute.For<IOrganizationRepository>();
     private readonly IOrganizationUserRepository _organizationUserRepository = Substitute.For<IOrganizationUserRepository>();
     private readonly IPricingClient _pricingClient = Substitute.For<IPricingClient>();
@@ -50,7 +51,7 @@ public class BusinessUnitConverterTests
         _dataProtectionProvider,
         _globalSettings,
         _logger,
-        _mailService,
+        _mailer,
         _organizationRepository,
         _organizationUserRepository,
         _pricingClient,
@@ -280,10 +281,11 @@ await _providerUserRepository.Received(1).CreateAsync(
                 argument.Status == ProviderUserStatusType.Invited &&
                 argument.Type == ProviderUserType.ProviderAdmin));
 
-        await _mailService.Received(1).SendBusinessUnitConversionInviteAsync(
-            organization,
-            token,
-            user.Email);
+        await _mailer.Received(1).SendEmail(
+            Arg.Is<BusinessUnitConversionInviteMail>(m =>
+                m.ToEmails.Contains(user.Email) &&
+                m.View.OrganizationId == organization.Id.ToString() &&
+                m.View.Token == System.Net.WebUtility.UrlEncode(token)));
     }
 
     [Theory, BitAutoData]
@@ -348,10 +350,11 @@ public async Task ResendConversionInvite_ConversionInProgress_Succeeds(
 
         await businessUnitConverter.ResendConversionInvite(organization, providerAdminEmail);
 
-        await _mailService.Received(1).SendBusinessUnitConversionInviteAsync(
-            organization,
-            token,
-            providerAdminEmail);
+        await _mailer.Received(1).SendEmail(
+            Arg.Is<BusinessUnitConversionInviteMail>(m =>
+                m.ToEmails.Contains(providerAdminEmail) &&
+                m.View.OrganizationId == organization.Id.ToString() &&
+                m.View.Token == System.Net.WebUtility.UrlEncode(token)));
     }
 
     [Theory, BitAutoData]
@@ -365,10 +368,8 @@ public async Task ResendConversionInvite_NoConversionInProgress_DoesNothing(
 
         await businessUnitConverter.ResendConversionInvite(organization, providerAdminEmail);
 
-        await _mailService.DidNotReceiveWithAnyArgs().SendBusinessUnitConversionInviteAsync(
-            Arg.Any<Organization>(),
-            Arg.Any<string>(),
-            Arg.Any<string>());
+        await _mailer.DidNotReceiveWithAnyArgs().SendEmail(
+            Arg.Any<BusinessUnitConversionInviteMail>());
     }
 
     #endregion
diff --git a/docs/plans/email-migrations/handlebars-to-mjml-transition.md b/docs/plans/email-migrations/handlebars-to-mjml-transition.md
new file mode 100644
index 000000000000..1ff59c6905bb
--- /dev/null
+++ b/docs/plans/email-migrations/handlebars-to-mjml-transition.md
@@ -0,0 +1,641 @@
+# Handlebars-to-MJML Email Transition Guide
+
+## Context
+
+Bitwarden's `HandlebarsMailService` is deprecated in favor of the new `IMailer` system. New emails should be authored as `.mjml` source files that compile to `.html.hbs` artifacts consumed by Handlebars at runtime. This document provides a systematic reference for converting existing Handlebars email templates to MJML, based on the official MJML documentation, the official Handlebars documentation, and Bitwarden's established MJML patterns.
+
+## Related Documentation
+
+Before converting templates, familiarize yourself with these key resources:
+
+- **[MailTemplates README](../../../src/Core/MailTemplates/README.md)** - Overview of the mail template system and directory structure
+- **[Mjml README](../../../src/Core/MailTemplates/Mjml/README.md)** - MJML build process, custom components, and development workflow
+- **[Platform Mail README](../../../src/Core/Platform/Mail/README.md)** - IMailer system architecture and integration guide
+
+---
+
+## 1. Architecture Overview
+
+### Current (Deprecated) Pipeline
+
+```
+Template (.html.hbs) + Layout partial (Full.html.hbs / ProviderFull.html.hbs)
+    → HandlebarsDotNet compiles at runtime
+    → Final HTML delivered to email client
+```
+
+Templates use `{{#>FullHtmlLayout}}` or `{{#>ProviderFull}}` block partials that inject content into a hand-coded HTML layout containing all styling, the logo, the footer, and email-client workarounds.
+
+### New Pipeline
+
+```
+Source (.mjml) + shared components (head.mjml, footer.mjml, mj-bw-* custom components)
+    → `npm run build:hbs` compiles MJML to .html.hbs
+    → .html.hbs artifact placed next to ViewModel class
+    → HandlebarsDotNet compiles at runtime with ViewModel data
+    → Final HTML delivered to email client
+```
+
+Key insight: **MJML and Handlebars are not competing—they run in sequence.** MJML compiles structural markup at build time; Handlebars resolves `{{ variables }}` at runtime. The `{{ }}` expressions pass through MJML compilation untouched because MJML does not interpret them.
+
+---
+
+## 2. Structural Mapping Reference
+
+### Layout → MJML Skeleton
+
+The old layout partials (`Full.html.hbs`, `ProviderFull.html.hbs`) are replaced by a standard MJML skeleton that uses `mj-include` for shared components:
+
+```xml
+<mjml>
+  <mj-head>
+    <mj-include path="../../components/head.mjml" />
+  </mj-head>
+
+  <mj-body>
+    <!-- Logo (replaces the header table in Full.html.hbs) -->
+    <mj-include path="../../components/logo.mjml" />
+
+    <!-- Main content area (replaces the {{>@partial-block}} region) -->
+    <mj-wrapper background-color="#fff" border="1px solid #e9e9e9"
+                css-class="border-fix" padding="0">
+      <mj-section>
+        <mj-column>
+          <!-- Template-specific content goes here -->
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+
+    <!-- Footer (replaces the social icons + copyright table) -->
+    <mj-include path="../../components/footer.mjml" />
+  </mj-body>
+</mjml>
+```
+
+For "Provider" style emails (blue header bar), use the `<mj-bw-simple-hero />` or `<mj-bw-hero />` custom components instead of the logo include.
+
+### Element-by-Element Mapping
+
+| Old Handlebars/HTML | MJML Equivalent | Notes |
+|---|---|---|
+| `{{#>FullHtmlLayout}}...{{/FullHtmlLayout}}` | `<mjml>` skeleton + `mj-include` for head/logo/footer | Layout is now implicit in the MJML structure |
+| `{{#>ProviderFull}}...{{/ProviderFull}}` | Skeleton with `<mj-bw-hero />` or `<mj-bw-simple-hero />` | Custom component renders the blue header bar |
+| `<table>` with `content-block` rows | `<mj-section>` + `<mj-column>` + `<mj-text>` | Each `<tr><td class="content-block">` → one `<mj-text>` block |
+| Inline-styled `<a>` button | `<mj-button href="...">` | Inherits `background-color: #175ddc` from `head.mjml` defaults |
+| `<br />` spacers | `<mj-spacer height="Xpx" />` or padding on `mj-text` | Prefer padding attributes over spacer elements |
+| Social icon `<table>` | `<mj-include path="...footer.mjml" />` | Already handled by shared footer component with `mj-social` |
+| `<style>` blocks in layout | `<mj-style>` in `head.mjml` | Global styles defined once via `mj-include` |
+| CSS classes (`content-block`, `main`, etc.) | `mj-class` or `css-class` attributes | Use `mj-class` for MJML-level attribute grouping; `css-class` to add HTML classes to generated output |
+| `style="font-family: ..."` on every element | `<mj-all font-family="...">` in `head.mjml` | Defined once; inherited by all components |
+
+---
+
+## 3. Handling Handlebars Logic Inside MJML
+
+This is the critical section. MJML compiles at **build time**, but Handlebars expressions evaluate at **runtime**. The `{{ }}` syntax passes through MJML compilation as plain text. The complexity arises when Handlebars block helpers (`{{#if}}`, `{{#each}}`, `{{#unless}}`) need to **wrap MJML structural elements**.
+
+### Case 1: Variables Inside Content (Simple)
+
+Handlebars expressions inside `<mj-text>` content work with zero changes:
+
+```xml
+<mj-text>
+  Your subscription renews on <b>{{date DueDate 'MMMM dd, yyyy'}}</b>.
+</mj-text>
+```
+
+Triple-stash for unescaped URLs also works:
+
+```xml
+<mj-button href="{{{Url}}}">Click Here</mj-button>
+```
+
+### Case 2: Conditional Text Within a Single Block (Medium)
+
+When `{{#if}}` controls which **text** to show but doesn't change the MJML structure, place it inside `<mj-text>`:
+
+```xml
+<mj-text>
+  {{#if HasPaymentMethod}}
+    Please ensure your {{PaymentMethodDescription}} can be charged.
+  {{else}}
+    Please add a payment method.
+  {{/if}}
+</mj-text>
+```
+
+This works because `<mj-text>` is an "ending tag"—its contents are treated as raw HTML by MJML and passed through untouched.
+
+### Case 3: Conditional MJML Structural Elements (Hard — Use `mj-raw`)
+
+When Handlebars conditionals need to **show or hide entire MJML sections, buttons, or table rows**, you cannot place `{{#if}}` around `<mj-section>` or `<mj-button>` tags directly—MJML would try to parse the `{{#if}}` as part of its structure and fail validation.
+
+**Strategy: Wrap Handlebars block helpers in `<mj-raw>` tags.**
+
+```xml
+<mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+
+<mj-section>
+  <mj-column>
+    <mj-text font-size="32px" font-weight="bold">
+      {{usd AmountDue}}
+    </mj-text>
+  </mj-column>
+</mj-section>
+
+<mj-raw>{{/unless}}</mj-raw>
+```
+
+The `<mj-raw>` tags tell MJML to emit their contents as literal text without parsing. At build time, the compiled `.html.hbs` will contain the raw Handlebars helpers wrapping the compiled HTML table structures. At runtime, Handlebars evaluates the conditionals normally.
+
+**Important caveats:**
+- If using `--minify` in the build, Handlebars `<` characters (rare but possible in subexpressions) may conflict with the HTML minifier. Wrap them in `<!-- htmlmin:ignore -->` tags:
+  ```xml
+  <mj-raw><!-- htmlmin:ignore -->{{#if (eq CollectionMethod "send_invoice")}}<!-- htmlmin:ignore --></mj-raw>
+  ```
+- Validation: Use `validationLevel: "soft"` or `"skip"` if `mj-raw` placement causes strict validation errors. Bitwarden's `build.js` currently uses `"strict"`, but `mj-raw` in legal positions (direct child of `mj-body`, `mj-wrapper`, or `mj-section`) should pass validation.
+
+### Case 4: Conditional Buttons/CTAs
+
+A common pattern in the existing templates is showing different buttons based on conditions. Convert like this:
+
+**Before (Handlebars HTML):**
+```handlebars
+{{#unless (eq CollectionMethod "send_invoice")}}
+<tr>
+  <td>
+    <table><tr><td style="background-color: #175DDC; border-radius: 25px; padding: 12px 24px;">
+      <a href="{{{UpdateBillingInfoUrl}}}" style="color: #ffffff; ...">Update payment method</a>
+    </td></tr></table>
+  </td>
+</tr>
+{{/unless}}
+```
+
+**After (MJML):**
+```xml
+<mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+
+<mj-section>
+  <mj-column>
+    <mj-button href="{{{UpdateBillingInfoUrl}}}" border-radius="25px">
+      Update payment method
+    </mj-button>
+  </mj-column>
+</mj-section>
+
+<mj-raw>{{/unless}}</mj-raw>
+```
+
+### Case 5: Loops (`{{#each}}`)
+
+Same pattern as conditionals—wrap the block helpers in `<mj-raw>`:
+
+```xml
+<mj-raw>{{#if Items}}</mj-raw>
+<mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+
+<mj-section>
+  <mj-column>
+    <mj-text>
+      <strong>Summary Of Charges</strong>
+      <div style="border-bottom: 1px solid #ddd; margin: 5px 0 10px 0;"></div>
+      {{#each Items}}
+        <div>{{this}}</div>
+      {{/each}}
+    </mj-text>
+  </mj-column>
+</mj-section>
+
+<mj-raw>{{/unless}}</mj-raw>
+<mj-raw>{{/if}}</mj-raw>
+```
+
+Note that `{{#each}}` inside `<mj-text>` (iterating over text content) does **not** need `mj-raw` wrapping—it's already inside an ending tag where MJML passes content through as-is.
+
+### Case 6: Custom Handlebars Helpers
+
+Bitwarden registers custom helpers in HandlebarsDotNet (e.g., `eq`, `date`, `usd`). These work identically in MJML templates since they're resolved at runtime:
+
+```xml
+<mj-text>
+  On <strong>{{date DueDate 'MMMM dd, yyyy'}}</strong> we'll send you an invoice.
+</mj-text>
+
+<mj-text font-size="32px" font-weight="bold">
+  {{usd AmountDue}}
+</mj-text>
+```
+
+---
+
+## 4. Worked Examples
+
+### Example A: Simple Email (BusinessUnitConversionInvite)
+
+**Original** — uses `{{#>FullHtmlLayout}}`, two table rows, one CTA button:
+
+```handlebars
+{{#>FullHtmlLayout}}
+  <table width="100%" ...>
+    <tr><td class="content-block" ...>
+      You have been invited to set up a new Business Unit Portal...
+    </td></tr>
+    <tr><td class="content-block" ... align="center">
+      <a href="{{{Url}}}" style="color: #ffffff; ... background-color: #175DDC; ...">
+        Set Up Business Unit Portal Now
+      </a>
+    </td></tr>
+  </table>
+{{/FullHtmlLayout}}
+```
+
+**Converted to MJML:**
+
+```xml
+<mjml>
+  <mj-head>
+    <mj-include path="../../components/head.mjml" />
+  </mj-head>
+
+  <mj-body>
+    <mj-include path="../../components/logo.mjml" />
+
+    <mj-wrapper background-color="#fff" border="1px solid #e9e9e9"
+                css-class="border-fix" padding="0">
+      <mj-section>
+        <mj-column>
+          <mj-text padding="0 0 10px">
+            You have been invited to set up a new Business Unit Portal
+            within Bitwarden.
+          </mj-text>
+
+          <mj-button href="{{{Url}}}" border-radius="5px">
+            Set Up Business Unit Portal Now
+          </mj-button>
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+
+    <mj-wrapper>
+      <mj-bw-learn-more-footer />
+    </mj-wrapper>
+
+    <mj-include path="../../components/footer.mjml" />
+  </mj-body>
+</mjml>
+```
+
+What changed:
+- 45 lines of inline-styled HTML → 28 lines of semantic MJML
+- All font-family, font-size, color, line-height declarations eliminated (inherited from `head.mjml`)
+- Button styling reduced from 8 inline CSS properties to 1 attribute
+- Layout partial replaced by `mj-include` composition
+- Responsive behavior is now automatic (columns stack on mobile)
+
+### Example B: Complex Email (ProviderInvoiceUpcoming)
+
+**Original** — uses `{{#>ProviderFull}}`, nested `{{#if}}` / `{{#unless}}` / `{{#each}}`, conditional buttons, two divergent content paths based on `CollectionMethod`:
+
+**Converted to MJML:**
+
+```xml
+<mjml>
+  <mj-head>
+    <mj-include path="../../components/head.mjml" />
+  </mj-head>
+
+  <mj-body css-class="border-fix">
+    <mj-wrapper css-class="border-fix" padding="20px 20px 0px 20px">
+      <mj-bw-simple-hero />
+    </mj-wrapper>
+
+    <mj-wrapper padding="0px 20px 0px 20px">
+      <!-- Heading and intro text — diverges based on CollectionMethod -->
+      <mj-section background-color="#fff" padding="15px 10px 10px 10px">
+        <mj-column>
+          <mj-text>
+            {{#if (eq CollectionMethod "send_invoice")}}
+              <div style="font-weight: 600; font-size: 24px; line-height: 32px; margin: 0 0 8px 0;">
+                Your subscription will renew soon
+              </div>
+              <div>
+                On <strong>{{date DueDate 'MMMM dd, yyyy'}}</strong> we'll send
+                you an invoice with a summary of the charges including tax.
+              </div>
+            {{else}}
+              <div style="font-weight: 600; font-size: 24px; line-height: 32px; margin: 0 0 8px 0;">
+                Your subscription will renew on {{date DueDate 'MMMM dd, yyyy'}}
+              </div>
+              {{#if HasPaymentMethod}}
+                <div>
+                  To avoid any interruption in service, please ensure your
+                  {{PaymentMethodDescription}} can be charged for the following amount:
+                </div>
+              {{else}}
+                <div>
+                  To avoid any interruption in service, please add a payment method
+                  that can be charged for the following amount:
+                </div>
+              {{/if}}
+            {{/if}}
+          </mj-text>
+        </mj-column>
+      </mj-section>
+
+      <!-- Amount due — only shown for non-invoice collection -->
+      <mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+      <mj-section background-color="#fff" padding="0 10px">
+        <mj-column>
+          <mj-text font-size="32px" font-weight="bold" padding="0 15px 20px">
+            {{usd AmountDue}}
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-raw>{{/unless}}</mj-raw>
+
+      <!-- Line items — only for non-invoice with items -->
+      <mj-raw>{{#if Items}}</mj-raw>
+      <mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+      <mj-section background-color="#fff" padding="0 10px 10px 10px">
+        <mj-column>
+          <mj-text padding="0 15px">
+            <strong>Summary Of Charges</strong>
+            <div style="border-bottom: 1px solid #ddd; margin: 5px 0 10px 0; padding-bottom: 5px;"></div>
+            {{#each Items}}
+              <div>{{this}}</div>
+            {{/each}}
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-raw>{{/unless}}</mj-raw>
+      <mj-raw>{{/if}}</mj-raw>
+
+      <!-- Invoice-only: pay by due date message -->
+      <mj-raw>{{#if (eq CollectionMethod "send_invoice")}}</mj-raw>
+      <mj-section background-color="#fff" padding="0 10px">
+        <mj-column>
+          <mj-text padding="0 15px 20px">
+            To avoid any interruption in service for you or your clients,
+            please pay the invoice by the due date, or contact Bitwarden
+            Customer Support to sign up for auto-pay.
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-raw>{{/if}}</mj-raw>
+
+      <!-- Non-invoice: update payment method CTA -->
+      <mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+      <mj-section background-color="#fff" padding="0 10px 10px 10px">
+        <mj-column>
+          <mj-button href="{{{UpdateBillingInfoUrl}}}" border-radius="25px">
+            Update payment method
+          </mj-button>
+        </mj-column>
+      </mj-section>
+      <mj-raw>{{/unless}}</mj-raw>
+
+      <!-- Invoice-only: contact support CTA -->
+      <mj-raw>{{#if (eq CollectionMethod "send_invoice")}}</mj-raw>
+      <mj-section background-color="#fff" padding="0 10px 10px 10px">
+        <mj-column>
+          <mj-button href="{{{ContactUrl}}}" border-radius="25px">
+            Contact Bitwarden Support
+          </mj-button>
+        </mj-column>
+      </mj-section>
+      <mj-raw>{{/if}}</mj-raw>
+
+      <!-- Help center footer — both paths show this -->
+      <mj-section background-color="#fff" padding="0 10px 20px 10px">
+        <mj-column>
+          <mj-text font-size="14px" line-height="20px" padding="0 15px">
+            For assistance managing your subscription, please visit
+            <a href="https://bitwarden.com/help/update-billing-info" class="link">
+              <strong>the Help Center</strong>
+            </a>
+            or
+            <a href="https://bitwarden.com/contact/" class="link">
+              <strong>contact Bitwarden Customer Support</strong>
+            </a>.
+          </mj-text>
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+
+    <!-- Learn More -->
+    <mj-wrapper padding="0px 20px 10px 20px">
+      <mj-bw-learn-more-footer />
+    </mj-wrapper>
+
+    <!-- Footer -->
+    <mj-include path="../../components/footer.mjml" />
+  </mj-body>
+</mjml>
+```
+
+Key conversion decisions:
+- **Text-level conditionals** (`{{#if}}` choosing between paragraphs) stay inside `<mj-text>` — no `mj-raw` needed
+- **Structural conditionals** (entire sections/buttons appearing or disappearing) use `<mj-raw>{{#if ...}}</mj-raw>` wrappers
+- **Nested conditionals** (the `{{#if Items}}` + `{{#unless (eq ...)}}` combination) use stacked `mj-raw` tags
+- **`{{#each}}`** inside text content stays inside `<mj-text>` — no wrapper needed
+- The help center footer text was identical in both `{{#if}}` and `{{#unless}}` branches in the original — consolidated into a single block
+- The `{{else}}` empty block from the original (which rendered nothing) is dropped entirely
+
+---
+
+## 5. Decision Framework: When to Use `mj-raw` vs. Inline Logic
+
+```
+Is the Handlebars block helper wrapping MJML tags (mj-section, mj-button, etc.)?
+  YES → Use <mj-raw>{{#if ...}}</mj-raw> ... <mj-raw>{{/if}}</mj-raw>
+  NO  → Is it inside an "ending tag" component (mj-text, mj-button, mj-table, mj-raw)?
+    YES → Place the helper directly in the content (no wrapping needed)
+    NO  → Use <mj-raw>
+```
+
+**"Ending tag" components** (accept raw HTML, do not parse MJML inside them):
+`mj-text`, `mj-button`, `mj-table`, `mj-raw`, `mj-navbar-link`, `mj-accordion-title`, `mj-accordion-text`, `mj-social-element`
+
+---
+
+## 6. Style Migration
+
+### Before: Every Element Carries Full Inline Styles
+
+```html
+<td style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px;
+    margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px;
+    -webkit-text-size-adjust: none; text-align: left;" valign="top">
+```
+
+### After: Defaults in `head.mjml`, Overrides as Attributes
+
+The shared `head.mjml` defines:
+```xml
+<mj-attributes>
+  <mj-all font-family="'Helvetica Neue', Helvetica, Arial, sans-serif" font-size="16px" />
+  <mj-button background-color="#175ddc" />
+  <mj-text color="#1B2029" />
+  <mj-body background-color="#e6e9ef" width="660px" />
+</mj-attributes>
+<mj-style inline="inline">
+  .link { text-decoration: none; color: #175ddc; font-weight: 600; }
+</mj-style>
+```
+
+In templates, only specify what **differs** from defaults:
+```xml
+<!-- Standard text — inherits everything from head.mjml -->
+<mj-text>Your subscription will renew soon.</mj-text>
+
+<!-- Override only what's different -->
+<mj-text font-size="32px" font-weight="bold">{{usd AmountDue}}</mj-text>
+
+<!-- Link styling uses the shared .link class -->
+<a href="..." class="link"><strong>the Help Center</strong></a>
+```
+
+### Reusable Style Classes
+
+Define via `mj-class` in `head.mjml`:
+```xml
+<mj-class name="heading" font-size="24px" font-weight="600" line-height="32px" />
+```
+
+Apply via the `mj-class` attribute:
+```xml
+<mj-text mj-class="heading">Your subscription will renew soon</mj-text>
+```
+
+---
+
+## 7. MJML Features That Simplify Development
+
+### Responsive Design (Free)
+MJML generates responsive HTML automatically. No need to write `@media` queries for column stacking. The old templates required hand-coded media queries in each layout partial.
+
+### `mj-include` (Replaces Handlebars Partials for Structure)
+```xml
+<mj-include path="../../components/head.mjml" />
+<mj-include path="../../components/footer.mjml" />
+```
+This replaces the `{{#>FullHtmlLayout}}` block partial pattern for layout composition. `mj-include` is resolved at MJML compile time.
+
+### Custom Components (Replace Repeated Patterns)
+Bitwarden already has: `mj-bw-hero`, `mj-bw-simple-hero`, `mj-bw-icon-row`, `mj-bw-learn-more-footer`. These are JS classes registered in `.mjmlconfig`. Consider creating new ones for patterns that repeat across templates (e.g., a "help center" footer link block).
+
+### `mj-social` (Replaces Social Icon Tables)
+The hand-built social icon tables (7 `<td>` elements with inline styles) are replaced by `mj-social` + `mj-social-element` in `footer.mjml`.
+
+### `mj-button` (Replaces Button Table Hacks)
+The old "table-in-table" button pattern with VML fallbacks is replaced by a single `<mj-button>` tag. MJML handles Outlook rendering internally.
+
+---
+
+## 8. Testing Strategy
+
+### 1. Visual Parity Check
+- Compile the original `.html.hbs` with sample data via the `IMailer` test harness
+- Compile the new `.mjml` → `.html.hbs` via `npm run build:hbs`, then render with the same sample data
+- Compare both outputs visually in multiple email clients (or use a tool like Litmus/Email on Acid)
+
+### 2. Handlebars Variable Verification
+- Ensure every `{{ variable }}` from the original template appears in the MJML version
+- Ensure custom helpers (`eq`, `date`, `usd`) are used identically
+- Run through the `IMailer` integration with the ViewModel to verify all variables resolve
+
+### 3. Conditional Branch Coverage
+For templates with logic (`{{#if}}`, `{{#unless}}`, `{{#each}}`):
+- Test each branch by providing different ViewModel data
+- For the ProviderInvoiceUpcoming example, test at minimum:
+  - `CollectionMethod = "send_invoice"` with items
+  - `CollectionMethod = "send_invoice"` without items
+  - `CollectionMethod != "send_invoice"` with `HasPaymentMethod = true` and items
+  - `CollectionMethod != "send_invoice"` with `HasPaymentMethod = false` and no items
+
+### 4. Build Pipeline Verification
+```shell
+cd src/Core/MailTemplates/Mjml
+npm ci
+npm run build:hbs        # Compile to .html.hbs
+npm run build:minify     # Compile minified .html.hbs
+```
+- Verify no MJML validation errors
+- Verify the `.html.hbs` output contains the Handlebars expressions intact
+- Copy artifacts to the correct directory per the README
+
+### 5. Responsive Testing
+- Open the compiled HTML in a browser and resize to mobile width (~375px)
+- Verify columns stack correctly
+- Verify images scale appropriately
+- Verify buttons remain tappable at mobile size
+
+---
+
+## 9. Edge Cases and Gotchas
+
+### Triple-Stash URLs
+Always use `{{{Url}}}` (triple-stash) for URLs in `href` attributes. Double-stash `{{Url}}` would HTML-encode `&` characters in query strings, breaking links. This is unchanged from the current Handlebars behavior.
+
+### Handlebars Comments in CSS
+The old layouts use `{{! Fix for Apple Mail }}` inside `<style>` blocks. In MJML, CSS goes into `<mj-style>` which passes through to a standard `<style>` tag. Handlebars comments in CSS will be stripped at runtime. If you need CSS comments, use standard `/* */` syntax. If you need Handlebars expressions in CSS (like the Apple Mail fix), place them in a `<mj-raw position="file-start">` or inside `<mj-style>`.
+
+### `mj-raw` Placement Rules
+`mj-raw` can be placed as a direct child of:
+- `mj-body`
+- `mj-wrapper`
+- `mj-section`
+- `mj-column`
+- `mj-head`
+
+It **cannot** be placed inside ending-tag components (`mj-text`, etc.)—but you don't need it there since those components already pass HTML through.
+
+### Minification and Handlebars
+When using `npm run build:minify`, the HTML minifier may strip or mangle Handlebars expressions that look like HTML (particularly `{{#if (gt value 0)}}`). If you encounter this, wrap the expression in `<!-- htmlmin:ignore -->`:
+```xml
+<mj-raw><!-- htmlmin:ignore -->{{#if (gt value 0)}}<!-- htmlmin:ignore --></mj-raw>
+```
+
+### Empty Conditional Branches
+The original ProviderInvoiceUpcoming has an `{{else}}` block that renders nothing (empty whitespace). Don't replicate this—drop the empty branch entirely or restructure as `{{#unless}}`.
+
+### `.text.hbs` Files
+MJML does not affect plain-text templates. Continue authoring `.text.hbs` files by hand, identically to the current process.
+
+### CSS-Class vs MJ-Class
+- `css-class="foo"` adds a CSS class to the **generated HTML output** — useful for targeting elements with `<mj-style>` rules
+- `mj-class="foo"` applies **MJML-level attribute presets** defined in `<mj-attributes>` — resolved at MJML compile time, not in CSS
+
+---
+
+## 10. Conversion Checklist
+
+For each email template being converted:
+
+- [ ] Identify the layout partial used (`Full`, `ProviderFull`, `FullUpdated`, etc.)
+- [ ] Map it to the correct MJML skeleton and components
+- [ ] Extract all Handlebars variables and helpers used
+- [ ] Identify all conditional logic branches
+- [ ] Classify each conditional as "text-level" (inside `mj-text`) or "structural" (needs `mj-raw`)
+- [ ] Write the `.mjml` file in the appropriate `emails/` subdirectory
+- [ ] Run `npm run build:hbs` and verify no compilation errors
+- [ ] Inspect the compiled `.html.hbs` to confirm Handlebars expressions are intact
+- [ ] Test all conditional branches with sample ViewModel data
+- [ ] Create/update the `.text.hbs` file (manual, not from MJML)
+- [ ] Copy the minified `.html.hbs` artifact to the correct ViewModel directory
+- [ ] Run the full email through `IMailer` integration test
+
+---
+
+## Sources
+
+- [MJML Official Documentation](https://documentation.mjml.io/)
+- [Handlebars Official Guide](https://handlebarsjs.com/guide/)
+- [MJML Templating Feature Discussion (Issue #1630)](https://github.com/mjmlio/mjml/issues/1630)
+- [Building Templated Emails with MJML (Thoughtbot)](https://thoughtbot.com/blog/building-templated-emails-with-mjml)
+- [Creating AWS Email Templates with Handlebars and MJML](https://blog.elmah.io/creating-aws-email-templates-with-handlebars-js-and-mjml/)
+- [mjml-handlebars Library](https://github.com/edus44/mjml-handlebars)
+- [Handlebars-MJML VS Code Extension](https://marketplace.visualstudio.com/items?itemName=rbremont.vscode-handlebars-mjml)
+- Bitwarden server repo: `src/Core/MailTemplates/Mjml/README.md`, `src/Core/Platform/Mail/README.md`
diff --git a/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs b/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
index ae2a76a7ce80..ca0b56e38dfd 100644
--- a/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
+++ b/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
@@ -12,6 +12,7 @@
 using Bit.Core.Models.Mail.Billing.Renewal.Families2019Renewal;
 using Bit.Core.Models.Mail.Billing.Renewal.Families2020Renewal;
 using Bit.Core.Models.Mail.Billing.Renewal.Premium;
+using Bit.Core.Models.Mail.Provider.ProviderInvoiceUpcoming;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Platform.Mail.Mailer;
 using Bit.Core.Repositories;
@@ -514,14 +515,21 @@ private async Task SendProviderUpcomingInvoiceEmailsAsync(IEnumerable<string> em
                 payPal => $"PayPal account {payPal.Email}"
             );
 
-            await mailService.SendProviderInvoiceUpcoming(
-                validEmails,
-                invoice.AmountDue / 100M,
-                invoice.NextPaymentAttempt.Value,
-                items,
-                collectionMethod,
-                hasPaymentMethod,
-                paymentMethodDescription);
+            var mail = new ProviderInvoiceUpcomingMail
+            {
+                ToEmails = validEmails,
+                View = new ProviderInvoiceUpcomingMailView
+                {
+                    AmountDue = invoice.AmountDue / 100M,
+                    DueDate = invoice.NextPaymentAttempt.Value,
+                    Items = items,
+                    CollectionMethod = collectionMethod,
+                    HasPaymentMethod = hasPaymentMethod,
+                    PaymentMethodDescription = paymentMethodDescription
+                }
+            };
+
+            await mailer.SendEmail(mail);
         }
     }
 
diff --git a/src/Core/MailTemplates/Mjml/CLAUDE.md b/src/Core/MailTemplates/Mjml/CLAUDE.md
new file mode 100644
index 000000000000..6b6f2bad11a7
--- /dev/null
+++ b/src/Core/MailTemplates/Mjml/CLAUDE.md
@@ -0,0 +1,142 @@
+# MJML Email Templates - Claude Code Configuration
+
+## Project Overview
+
+This directory contains MJML source templates that compile to `.html.hbs` (Handlebars) files consumed by Bitwarden's `IMailer` infrastructure. MJML provides responsive, component-based email markup that reduces the complexity of cross-client HTML emails.
+
+**Pipeline**: `.mjml` → `build.js` → `.html.hbs` → Handlebars runtime → delivered email
+
+## Common Commands
+
+```shell
+npm ci                   # Install dependencies
+npm run build            # Compile *.mjml → *.html (HTML preview)
+npm run build:hbs        # Compile *.mjml → *.html.hbs (Handlebars, for IMailer)
+npm run build:minify     # Compile → minified *.html.hbs (production deliverable)
+npm run build:watch      # Watch mode (does NOT track new files; restart after adding files)
+npm run prettier         # Format all files
+```
+
+## Directory Structure
+
+```
+Mjml/
+├── components/                        # Global reusable components (shared across all emails)
+│   ├── head.mjml                      # Shared font, color, button styling — include in ALL templates
+│   ├── footer.mjml                    # Social links, copyright, security notice
+│   ├── logo.mjml                      # Bitwarden logo
+│   ├── mj-bw-hero.js                  # Blue header with logo, title, image, optional button
+│   ├── mj-bw-simple-hero.js           # Simplified hero variant
+│   ├── mj-bw-icon-row.js              # Icon + text row; icons hidden on mobile
+│   └── mj-bw-learn-more-footer.js     # "Learn more" section with image
+│
+├── emails/                            # Template source files organized by product area
+│   ├── Auth/                          # Authentication: OTP, 2FA, emergency access, onboarding
+│   ├── AdminConsole/                  # Org management: invitations, confirmations
+│   │   └── components/                # AdminConsole-specific component overrides
+│   ├── Billing/                       # Renewals, payment updates, business unit invites
+│   ├── Provider/                      # Provider-specific emails
+│   └── invite.mjml                    # Generic invite
+│
+├── out/                               # Build output — DO NOT edit manually (git-ignored)
+├── build.js                           # Build orchestration script
+├── .mjmlconfig                        # Registers all custom JS components
+├── package.json
+└── README.md
+```
+
+## Adding a New Email Template
+
+1. Create `your-email-name.mjml` in the appropriate team subdirectory under `emails/`.
+2. Run `npm run build:watch` and iterate in a browser.
+3. Run `npm run build:hbs` to generate the `.html.hbs` artifact.
+4. Copy the built `*.html.hbs` from `out/` to the matching path in `/src/Core/MailTemplates/Mjml/` (alongside the corresponding ViewModel and `.txt.hbs`).
+5. The minified `html.hbs` is the production deliverable — run `npm run build:minify` for final output.
+
+## Template Structure Pattern
+
+Every template must follow this structure:
+
+```xml
+<mjml>
+  <mj-head>
+    <!-- ALWAYS include shared styles -->
+    <mj-include path="../../components/head.mjml" />
+    <!-- Optional template-specific styles -->
+    <mj-style>/* ... */</mj-style>
+  </mj-head>
+  <mj-body>
+    <mj-wrapper>
+      <mj-bw-hero img-src="..." title="..." />
+    </mj-wrapper>
+    <!-- Content sections -->
+    <mj-wrapper>
+      <mj-section>
+        <mj-column><!-- content --></mj-column>
+      </mj-section>
+    </mj-wrapper>
+    <!-- ALWAYS include footer -->
+    <mj-include path="../../components/footer.mjml" />
+  </mj-body>
+</mjml>
+```
+
+## Handlebars Variables
+
+Use standard double-brace syntax directly in MJML — Handlebars resolves these at runtime, not at compile time:
+
+```html
+{{VariableName}}
+{{#if Condition}}...{{/if}}
+```
+
+Common variables: `{{Token}}`, `{{Url}}`, `{{InviterEmail}}`, `{{ExpirationDate}}`, `{{CurrentYear}}`
+
+## Custom Components
+
+### Creating a Component
+
+1. Create `components/mj-bw-your-component.js` extending `BodyComponent` from `mjml-core`.
+2. Register it in `.mjmlconfig` under `"packages"`.
+3. Use `static allowedAttributes` and `static dependencies` to define the interface.
+4. Return MJML markup string from `render()` via `this.renderMJML(...)`.
+
+### Registered Components
+
+| Tag | File | Notes |
+|-----|------|-------|
+| `mj-bw-hero` | `components/mj-bw-hero.js` | Blue header; `img-src` and `title` required |
+| `mj-bw-simple-hero` | `components/mj-bw-simple-hero.js` | Simplified variant |
+| `mj-bw-icon-row` | `components/mj-bw-icon-row.js` | Icon hidden on mobile |
+| `mj-bw-learn-more-footer` | `components/mj-bw-learn-more-footer.js` | |
+| `mj-bw-ac-hero` | `emails/AdminConsole/components/` | AdminConsole variant |
+| `mj-bw-ac-icon-row` | `emails/AdminConsole/components/` | With bullet points |
+| `mj-bw-ac-icon-row-without-bulletins` | `emails/AdminConsole/components/` | No bullets |
+| `mj-bw-ac-learn-more-footer` | `emails/AdminConsole/components/` | AC styling |
+| `mj-bw-inviter-info` | `emails/AdminConsole/components/` | Shows inviter details |
+
+## Styling Conventions
+
+- **Primary blue**: `#175ddc`
+- **Background gray**: `#e6e9ef`
+- **Content background**: `#fff`
+- **Font stack**: Helvetica Neue, Arial, sans-serif; 16px base
+- **Base width**: 660px; mobile responsive via `componentHeadStyle` media queries
+- **Image CDN**: `https://assets.bitwarden.com/email/v1/`
+- Decorative images should be hidden on mobile
+
+## Integration with IMailer
+
+The `.html.hbs` build artifacts must reside alongside their ViewModel and `.txt.hbs` in `/src/Core/MailTemplates/Mjml/<Team>/`. The `IMailer` (see `src/Core/Platform/Mail/README.md`) loads these three files together. `IMailService` is deprecated — use `IMailer`.
+
+## Critical Rules
+
+- **ALWAYS** include `components/head.mjml` in every template's `<mj-head>`.
+- **ALWAYS** include `components/footer.mjml` at the end of every `<mj-body>`.
+- **NEVER** edit files in `out/` directly — they are generated artifacts.
+- **NEVER** commit `out/` files; copy minified artifacts to the correct `MailTemplates/` path.
+- Register every new custom component in `.mjmlconfig` before referencing it in a template.
+- Run `npm run prettier` before committing `.mjml` or `.js` changes.
+- `build:watch` does not detect new files — restart it after creating new `.mjml` files.
+- **NEVER** use inline CSS (`style="..."`); define styles in `<mj-style>` within `<mj-head>`.
+- **AVOID** style attributes on MJML elements (e.g. `font-size`, `color`, `padding`); prefer class-based styles defined in `<mj-head>`.
diff --git a/src/Core/MailTemplates/Mjml/emails/Provider/ProviderInvoiceUpcoming.mjml b/src/Core/MailTemplates/Mjml/emails/Provider/ProviderInvoiceUpcoming.mjml
new file mode 100644
index 000000000000..c02f7d47e45e
--- /dev/null
+++ b/src/Core/MailTemplates/Mjml/emails/Provider/ProviderInvoiceUpcoming.mjml
@@ -0,0 +1,131 @@
+<mjml>
+    <mj-head>
+        <mj-include path="../../components/head.mjml" />
+    </mj-head>
+
+    <mj-body css-class="border-fix">
+        <mj-wrapper css-class="border-fix" padding="20px 20px 0px 20px">
+            <mj-bw-simple-hero />
+        </mj-wrapper>
+
+        <mj-wrapper padding="0px 20px 0px 20px">
+            <!-- Heading and intro text — diverges based on CollectionMethod -->
+            <mj-section background-color="#fff" padding="15px 10px 10px 10px">
+                <mj-column>
+                    <mj-text>
+                        {{#if (eq CollectionMethod "send_invoice")}}
+                        <div style="font-weight: 600; font-size: 24px; line-height: 32px; margin: 0 0 8px 0;">
+                            Your subscription will renew soon
+                        </div>
+                        <div>
+                            On <strong>{{date DueDate 'MMMM dd, yyyy'}}</strong> we'll send you an invoice with a
+                            summary of the charges including tax.
+                        </div>
+                        {{else}}
+                        <div style="font-weight: 600; font-size: 24px; line-height: 32px; margin: 0 0 8px 0;">
+                            Your subscription will renew on {{date DueDate 'MMMM dd, yyyy'}}
+                        </div>
+                        {{#if HasPaymentMethod}}
+                        <div>
+                            To avoid any interruption in service, please ensure your
+                            {{PaymentMethodDescription}} can be charged for the following amount:
+                        </div>
+                        {{else}}
+                        <div>
+                            To avoid any interruption in service, please add a payment method
+                            that can be charged for the following amount:
+                        </div>
+                        {{/if}}
+                        {{/if}}
+                    </mj-text>
+                </mj-column>
+            </mj-section>
+
+            <!-- Amount due — only shown for non-invoice collection -->
+            <mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+            <mj-section background-color="#fff" padding="0 10px">
+                <mj-column>
+                    <mj-text font-size="32px" font-weight="bold" padding="0 15px 20px">
+                        {{usd AmountDue}}
+                    </mj-text>
+                </mj-column>
+            </mj-section>
+            <mj-raw>{{/unless}}</mj-raw>
+
+            <!-- Line items — only for non-invoice with items -->
+            <mj-raw>{{#if Items}}</mj-raw>
+            <mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+            <mj-section background-color="#fff" padding="0 10px 10px 10px">
+                <mj-column>
+                    <mj-text padding="0 15px">
+                        <strong>Summary Of Charges</strong>
+                        <div style="border-bottom: 1px solid #ddd; margin: 5px 0 10px 0; padding-bottom: 5px;"></div>
+                        {{#each Items}}
+                        <div>{{this}}</div>
+                        {{/each}}
+                    </mj-text>
+                </mj-column>
+            </mj-section>
+            <mj-raw>{{/unless}}</mj-raw>
+            <mj-raw>{{/if}}</mj-raw>
+
+            <!-- Invoice-only: pay by due date message -->
+            <mj-raw>{{#if (eq CollectionMethod "send_invoice")}}</mj-raw>
+            <mj-section background-color="#fff" padding="0 10px">
+                <mj-column>
+                    <mj-text padding="0 15px 20px">
+                        To avoid any interruption in service for you or your clients, please pay the invoice by the due
+                        date, or contact Bitwarden Customer Support to sign up for auto-pay.
+                    </mj-text>
+                </mj-column>
+            </mj-section>
+            <mj-raw>{{/if}}</mj-raw>
+
+            <!-- Non-invoice: update payment method CTA -->
+            <mj-raw>{{#unless (eq CollectionMethod "send_invoice")}}</mj-raw>
+            <mj-section background-color="#fff" padding="0 10px 10px 10px">
+                <mj-column>
+                    <mj-button href="{{{UpdateBillingInfoUrl}}}" border-radius="25px">
+                        Update payment method
+                    </mj-button>
+                </mj-column>
+            </mj-section>
+            <mj-raw>{{/unless}}</mj-raw>
+
+            <!-- Invoice-only: contact support CTA -->
+            <mj-raw>{{#if (eq CollectionMethod "send_invoice")}}</mj-raw>
+            <mj-section background-color="#fff" padding="0 10px 10px 10px">
+                <mj-column>
+                    <mj-button href="{{{ContactUrl}}}" border-radius="25px">
+                        Contact Bitwarden Support
+                    </mj-button>
+                </mj-column>
+            </mj-section>
+            <mj-raw>{{/if}}</mj-raw>
+
+            <!-- Help center footer — both paths show this -->
+            <mj-section background-color="#fff" padding="0 10px 20px 10px">
+                <mj-column>
+                    <mj-text font-size="14px" line-height="20px" padding="0 15px">
+                        For assistance managing your subscription, please visit
+                        <a href="https://bitwarden.com/help/update-billing-info" class="link">
+                            <strong>the Help Center</strong>
+                        </a>
+                        or
+                        <a href="https://bitwarden.com/contact/" class="link">
+                            <strong>contact Bitwarden Customer Support</strong>
+                        </a>.
+                    </mj-text>
+                </mj-column>
+            </mj-section>
+        </mj-wrapper>
+
+        <!-- Learn More -->
+        <mj-wrapper padding="0px 20px 10px 20px">
+            <mj-bw-learn-more-footer />
+        </mj-wrapper>
+
+        <!-- Footer -->
+        <mj-include path="../../components/footer.mjml" />
+    </mj-body>
+</mjml>
diff --git a/src/Core/MailTemplates/Mjml/emails/Provider/ProviderUpdatePaymentMethod.mjml b/src/Core/MailTemplates/Mjml/emails/Provider/ProviderUpdatePaymentMethod.mjml
new file mode 100644
index 000000000000..49c869d78a07
--- /dev/null
+++ b/src/Core/MailTemplates/Mjml/emails/Provider/ProviderUpdatePaymentMethod.mjml
@@ -0,0 +1,43 @@
+<mjml>
+    <mj-head>
+        <mj-include path="../../components/head.mjml" />
+        <mj-style>
+            .body-link { color: #175ddc; text-decoration: underline; }
+        </mj-style>
+    </mj-head>
+
+    <mj-body>
+        <mj-include path="../../components/logo.mjml" />
+
+        <mj-wrapper background-color="#fff" border="1px solid #e9e9e9"
+                    css-class="border-fix" padding="0">
+            <mj-section>
+                <mj-column>
+                    <mj-text>
+                        Your organization, {{OrganizationName}}, is no longer managed by {{ProviderName}}. Please update your billing information.
+                    </mj-text>
+
+                    <mj-text>
+                        To maintain your subscription, update your organization billing information by navigating to the web vault -> Organization -> Billing ->
+                        <a href="{{{PaymentMethodUrl}}}" target="_blank" clicktracking="off" class="body-link">Payment Method</a>.
+                    </mj-text>
+
+                    <mj-text>
+                        For more information, please refer to the following help article:
+                        <a href="https://bitwarden.com/help/update-billing-info/#update-billing-information-for-organizations" target="_blank" clicktracking="off" class="body-link">Update billing information for organizations</a>
+                    </mj-text>
+
+                    <mj-button href="{{{PaymentMethodUrl}}}" border-radius="5px">
+                        Add payment method
+                    </mj-button>
+                </mj-column>
+            </mj-section>
+        </mj-wrapper>
+
+        <mj-wrapper>
+            <mj-bw-learn-more-footer />
+        </mj-wrapper>
+
+        <mj-include path="../../components/footer.mjml" />
+    </mj-body>
+</mjml>
diff --git a/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.cs b/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.cs
new file mode 100644
index 000000000000..d0dfaad81fb4
--- /dev/null
+++ b/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.cs
@@ -0,0 +1,27 @@
+using Bit.Core.Platform.Mail.Mailer;
+
+namespace Bit.Core.Models.Mail.Billing.BusinessUnitConversionInvite;
+
+#nullable enable
+
+/// <summary>
+/// Email sent to invite users to set up a Business Unit Portal.
+/// </summary>
+public class BusinessUnitConversionInviteMail : BaseMail<BusinessUnitConversionInviteMailView>
+{
+    public override string Subject { get; set; } = "Set Up Business Unit";
+}
+
+/// <summary>
+/// View model for Business Unit Conversion Invite email template.
+/// </summary>
+public class BusinessUnitConversionInviteMailView : BaseMailView
+{
+    public required string OrganizationId { get; init; }
+    public required string Email { get; init; }
+    public required string Token { get; init; }
+    public required string WebVaultUrl { get; init; }
+
+    public string Url =>
+        $"{WebVaultUrl}/providers/setup-business-unit?organizationId={OrganizationId}&email={Email}&token={Token}";
+}
diff --git a/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.html.hbs b/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.html.hbs
new file mode 100644
index 000000000000..49aebe382b29
--- /dev/null
+++ b/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.html.hbs
@@ -0,0 +1,519 @@
+<!doctype html>
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+  <head>
+    <title></title>
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <!--<![endif]-->
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+      #outlook a { padding:0; }
+      body { margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%; }
+      table, td { border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt; }
+      img { border:0;height:auto;line-height:100%; outline:none;text-decoration:none;-ms-interpolation-mode:bicubic; }
+      p { display:block;margin:13px 0; }
+    </style>
+    <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+    <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+    
+    
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+        .mj-column-per-100 { width:100% !important; max-width: 100%; }
+.mj-column-per-70 { width:70% !important; max-width: 70%; }
+.mj-column-per-30 { width:30% !important; max-width: 30%; }
+      }
+    </style>
+    <style media="screen and (min-width:480px)">
+      .moz-text-html .mj-column-per-100 { width:100% !important; max-width: 100%; }
+.moz-text-html .mj-column-per-70 { width:70% !important; max-width: 70%; }
+.moz-text-html .mj-column-per-30 { width:30% !important; max-width: 30%; }
+    </style>
+    
+    
+  
+    
+    <style type="text/css">
+
+      @media only screen and (max-width:480px) {
+        .mj-bw-learn-more-footer-responsive-img {
+          display: none !important;
+        }
+      }
+    
+
+    @media only screen and (max-width:479px) {
+      table.mj-full-width-mobile { width: 100% !important; }
+      td.mj-full-width-mobile { width: auto !important; }
+    }
+  
+    </style>
+     
+    <style type="text/css">
+.border-fix > table {
+    border-collapse: separate !important;
+  }
+  .border-fix > table > tbody > tr > td {
+    border-radius: 3px;
+  }
+    </style>
+    
+  </head>
+  <body style="word-spacing:normal;background-color:#e6e9ef;">
+    
+    
+      <div style="background-color:#e6e9ef;" lang="und" dir="auto">
+        
+      
+      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:660px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+        <tbody>
+          <tr>
+            <td style="width:250px;">
+              
+      <img alt src="https://bitwarden.com/images/logo-horizontal-blue.png" style="border:0;display:block;outline:none;text-decoration:none;height:39px;width:100%;font-size:16px;" width="250" height="39">
+    
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="border-fix-outlook" role="presentation" style="width:660px;" width="660" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div class="border-fix" style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="border:1px solid #e9e9e9;direction:ltr;font-size:0px;padding:0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:658px;" width="658" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:658px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:658px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:0 0 10px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;">You have been invited to set up a new Business Unit Portal within Bitwarden.</div>
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+        <tbody>
+          <tr>
+            <td align="center" bgcolor="#175ddc" role="presentation" style="border:none;border-radius:5px;cursor:auto;mso-padding-alt:10px 25px;background:#175ddc;" valign="middle">
+              <a href="{{{Url}}}" style="display:inline-block;background:#175ddc;color:#ffffff;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:5px;" target="_blank">
+                Set Up Business Unit Portal Now
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" bgcolor="#F3F6F9" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#F3F6F9;background-color:#F3F6F9;margin:0px auto;border-radius:0px 0px 4px 4px;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#F3F6F9;background-color:#F3F6F9;width:100%;border-radius:0px 0px 4px 4px;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:5px 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:448px;" ><![endif]-->
+            
+      <div class="mj-column-per-70 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:24px;text-align:left;color:#1B2029;"><p style="font-size: 18px; line-height: 28px; font-weight: bold;">
+              Learn more about Bitwarden
+            </p>
+            Find user guides, product documentation, and videos on the
+            <a href="https://bitwarden.com/help/" class="link" style="text-decoration: none; color: #175ddc; font-weight: 600;"> Bitwarden Help Center</a>.</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td><td class="" style="vertical-align:top;width:192px;" ><![endif]-->
+            
+      <div class="mj-column-per-30 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" class="mj-bw-learn-more-footer-responsive-img" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+        <tbody>
+          <tr>
+            <td style="width:94px;">
+              
+      <img alt src="https://assets.bitwarden.com/email/v1/spot-community.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:16px;" width="94" height="auto">
+    
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:5px 20px 10px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:620px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                  
+      
+     <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" ><tr><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://x.com/bitwarden" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-x-twitter.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.reddit.com/r/Bitwarden/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-reddit.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://community.bitwarden.com/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-discourse.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://github.com/bitwarden" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-github.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.youtube.com/channel/UCId9a_jQqvJre0_dE2lE_Rw" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-youtube.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.linkedin.com/company/bitwarden1/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-linkedin.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.facebook.com/bitwarden/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-facebook.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:12px;line-height:16px;text-align:center;color:#5A6D91;"><p style="margin-bottom: 5px; margin-top: 5px">
+        © {{ CurrentYear }} Bitwarden Inc. 1 N. Calle Cesar Chavez, Suite 102, Santa
+        Barbara, CA, USA
+      </p>
+      <p style="margin-top: 5px">
+        Always confirm you are on a trusted Bitwarden domain before logging
+        in:<br>
+        <a href="https://bitwarden.com/" style="text-decoration:none;color:#175ddc; font-weight:400">bitwarden.com</a> |
+        <a href="https://bitwarden.com/help/emails-from-bitwarden/" style="text-decoration:none; color:#175ddc; font-weight:400">Learn why we include this</a>
+      </p></div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    
+      </div>
+    
+  </body>
+</html>
+  
\ No newline at end of file
diff --git a/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.text.hbs b/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.text.hbs
new file mode 100644
index 000000000000..b2973f32c22f
--- /dev/null
+++ b/src/Core/Models/Mail/Billing/BusinessUnitConversionInvite/BusinessUnitConversionInviteMailView.text.hbs
@@ -0,0 +1,5 @@
+{{#>BasicTextLayout}}
+    You have been invited to set up a new Business Unit Portal within Bitwarden. To continue, click the following link:
+
+    {{{Url}}}
+{{/BasicTextLayout}}
diff --git a/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.cs b/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.cs
new file mode 100644
index 000000000000..effea2d9adc5
--- /dev/null
+++ b/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.cs
@@ -0,0 +1,28 @@
+using Bit.Core.Platform.Mail.Mailer;
+
+namespace Bit.Core.Models.Mail.Provider.ProviderInvoiceUpcoming;
+
+#nullable enable
+
+/// <summary>
+/// Email sent to providers when their upcoming invoice is approaching.
+/// </summary>
+public class ProviderInvoiceUpcomingMail : BaseMail<ProviderInvoiceUpcomingMailView>
+{
+    public override string Subject { get; set; } = "Your upcoming Bitwarden invoice";
+}
+
+/// <summary>
+/// View model for Provider Invoice Upcoming email template.
+/// </summary>
+public class ProviderInvoiceUpcomingMailView : BaseMailView
+{
+    public required decimal AmountDue { get; init; }
+    public required DateTime DueDate { get; init; }
+    public required List<string> Items { get; init; }
+    public string? CollectionMethod { get; init; }
+    public bool HasPaymentMethod { get; init; }
+    public string? PaymentMethodDescription { get; init; }
+    public string UpdateBillingInfoUrl { get; init; } = "https://bitwarden.com/help/update-billing-info/";
+    public string ContactUrl { get; init; } = "https://bitwarden.com/contact/";
+}
diff --git a/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.html.hbs b/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.html.hbs
new file mode 100644
index 000000000000..de5dc4733017
--- /dev/null
+++ b/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.html.hbs
@@ -0,0 +1,841 @@
+<!doctype html>
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+  <head>
+    <title></title>
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <!--<![endif]-->
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+      #outlook a { padding:0; }
+      body { margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%; }
+      table, td { border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt; }
+      img { border:0;height:auto;line-height:100%; outline:none;text-decoration:none;-ms-interpolation-mode:bicubic; }
+      p { display:block;margin:13px 0; }
+    </style>
+    <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+    <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+    
+    
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+        .mj-column-per-100 { width:100% !important; max-width: 100%; }
+.mj-column-per-70 { width:70% !important; max-width: 70%; }
+.mj-column-per-30 { width:30% !important; max-width: 30%; }
+      }
+    </style>
+    <style media="screen and (min-width:480px)">
+      .moz-text-html .mj-column-per-100 { width:100% !important; max-width: 100%; }
+.moz-text-html .mj-column-per-70 { width:70% !important; max-width: 70%; }
+.moz-text-html .mj-column-per-30 { width:30% !important; max-width: 30%; }
+    </style>
+    
+    
+  
+    
+    <style type="text/css">
+
+      @media only screen and (max-width:480px) {
+        .mj-bw-learn-more-footer-responsive-img {
+          display: none !important;
+        }
+      }
+    
+
+    @media only screen and (max-width:479px) {
+      table.mj-full-width-mobile { width: 100% !important; }
+      td.mj-full-width-mobile { width: auto !important; }
+    }
+  
+    </style>
+     
+    <style type="text/css">
+.border-fix > table {
+    border-collapse: separate !important;
+  }
+  .border-fix > table > tbody > tr > td {
+    border-radius: 3px;
+  }
+    </style>
+    
+  </head>
+  <body style="word-spacing:normal;background-color:#e6e9ef;">
+    
+    
+      <div class="border-fix" style="background-color:#e6e9ef;" lang="und" dir="auto">
+        
+      
+      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="border-fix-outlook" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div class="border-fix" style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 20px 0px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="660px" ><![endif]-->
+            
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#175ddc;background-color:#175ddc;width:100%;border-radius:4px 4px 0px 0px;">
+        <tbody>
+          <tr>
+            <td>
+              
+        
+      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#175ddc" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+        
+      <div style="margin:0px auto;border-radius:4px 4px 0px 0px;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;border-radius:4px 4px 0px 0px;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:580px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 5px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+        <tbody>
+          <tr>
+            <td style="width:150px;">
+              
+      <img alt src="https://bitwarden.com/images/logo-horizontal-white.png" style="border:0;display:block;outline:none;text-decoration:none;height:30px;width:100%;font-size:16px;" width="150" height="30">
+    
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+        
+      <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+      
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0px 20px 0px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><![endif]-->
+                  
+      <!-- Heading and intro text — diverges based on CollectionMethod -->
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:15px 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;">{{#if (eq CollectionMethod "send_invoice")}}
+                        <div style="font-weight: 600; font-size: 24px; line-height: 32px; margin: 0 0 8px 0;">
+                            Your subscription will renew soon
+                        </div>
+                        <div>
+                            On <strong>{{date DueDate 'MMMM dd, yyyy'}}</strong> we'll send you an invoice with a
+                            summary of the charges including tax.
+                        </div>
+                        {{else}}
+                        <div style="font-weight: 600; font-size: 24px; line-height: 32px; margin: 0 0 8px 0;">
+                            Your subscription will renew on {{date DueDate 'MMMM dd, yyyy'}}
+                        </div>
+                        {{#if HasPaymentMethod}}
+                        <div>
+                            To avoid any interruption in service, please ensure your
+                            {{PaymentMethodDescription}} can be charged for the following amount:
+                        </div>
+                        {{else}}
+                        <div>
+                            To avoid any interruption in service, please add a payment method
+                            that can be charged for the following amount:
+                        </div>
+                        {{/if}}
+                        {{/if}}</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+        <!-- Amount due — only shown for non-invoice collection -->{{#unless (eq CollectionMethod "send_invoice")}}
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:0 15px 20px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:32px;font-weight:bold;line-height:1;text-align:left;color:#1B2029;">{{usd AmountDue}}</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+        {{/unless}}<!-- Line items — only for non-invoice with items -->{{#if Items}}{{#unless (eq CollectionMethod "send_invoice")}}
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:0 15px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;"><strong>Summary Of Charges</strong>
+                        <div style="border-bottom: 1px solid #ddd; margin: 5px 0 10px 0; padding-bottom: 5px;"></div>
+                        {{#each Items}}
+                        <div>{{this}}</div>
+                        {{/each}}</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+        {{/unless}}{{/if}}<!-- Invoice-only: pay by due date message -->{{#if (eq CollectionMethod "send_invoice")}}
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:0 15px 20px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;">To avoid any interruption in service for you or your clients, please pay the invoice by the due
+                        date, or contact Bitwarden Customer Support to sign up for auto-pay.</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+        {{/if}}<!-- Non-invoice: update payment method CTA -->{{#unless (eq CollectionMethod "send_invoice")}}
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+        <tbody>
+          <tr>
+            <td align="center" bgcolor="#175ddc" role="presentation" style="border:none;border-radius:25px;cursor:auto;mso-padding-alt:10px 25px;background:#175ddc;" valign="middle">
+              <a href="{{{UpdateBillingInfoUrl}}}" style="display:inline-block;background:#175ddc;color:#ffffff;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:25px;" target="_blank">
+                Update payment method
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+        {{/unless}}<!-- Invoice-only: contact support CTA -->{{#if (eq CollectionMethod "send_invoice")}}
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+        <tbody>
+          <tr>
+            <td align="center" bgcolor="#175ddc" role="presentation" style="border:none;border-radius:25px;cursor:auto;mso-padding-alt:10px 25px;background:#175ddc;" valign="middle">
+              <a href="{{{ContactUrl}}}" style="display:inline-block;background:#175ddc;color:#ffffff;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:25px;" target="_blank">
+                Contact Bitwarden Support
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr><![endif]-->
+        {{/if}}<!-- Help center footer — both paths show this -->
+          <!--[if mso | IE]><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0 10px 20px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:0 15px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;line-height:20px;text-align:left;color:#1B2029;">For assistance managing your subscription, please visit
+                        <a href="https://bitwarden.com/help/update-billing-info" class="link" style="text-decoration: none; color: #175ddc; font-weight: 600;">
+                            <strong>the Help Center</strong>
+                        </a>
+                        or
+                        <a href="https://bitwarden.com/contact/" class="link" style="text-decoration: none; color: #175ddc; font-weight: 600;">
+                            <strong>contact Bitwarden Customer Support</strong>
+                        </a>.</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    <!-- Learn More -->
+      
+      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:0px 20px 10px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:620px;" width="620" bgcolor="#F3F6F9" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#F3F6F9;background-color:#F3F6F9;margin:0px auto;border-radius:0px 0px 4px 4px;max-width:620px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#F3F6F9;background-color:#F3F6F9;width:100%;border-radius:0px 0px 4px 4px;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:5px 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:420px;" ><![endif]-->
+            
+      <div class="mj-column-per-70 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:24px;text-align:left;color:#1B2029;"><p style="font-size: 18px; line-height: 28px; font-weight: bold;">
+              Learn more about Bitwarden
+            </p>
+            Find user guides, product documentation, and videos on the
+            <a href="https://bitwarden.com/help/" class="link" style="text-decoration: none; color: #175ddc; font-weight: 600;"> Bitwarden Help Center</a>.</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td><td class="" style="vertical-align:top;width:180px;" ><![endif]-->
+            
+      <div class="mj-column-per-30 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" class="mj-bw-learn-more-footer-responsive-img" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+        <tbody>
+          <tr>
+            <td style="width:94px;">
+              
+      <img alt src="https://assets.bitwarden.com/email/v1/spot-community.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:16px;" width="94" height="auto">
+    
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    <!-- Footer -->
+      
+      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:5px 20px 10px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:620px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                  
+      
+     <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" ><tr><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://x.com/bitwarden" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-x-twitter.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.reddit.com/r/Bitwarden/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-reddit.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://community.bitwarden.com/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-discourse.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://github.com/bitwarden" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-github.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.youtube.com/channel/UCId9a_jQqvJre0_dE2lE_Rw" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-youtube.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.linkedin.com/company/bitwarden1/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-linkedin.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.facebook.com/bitwarden/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-facebook.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:12px;line-height:16px;text-align:center;color:#5A6D91;"><p style="margin-bottom: 5px; margin-top: 5px">
+        © {{ CurrentYear }} Bitwarden Inc. 1 N. Calle Cesar Chavez, Suite 102, Santa
+        Barbara, CA, USA
+      </p>
+      <p style="margin-top: 5px">
+        Always confirm you are on a trusted Bitwarden domain before logging
+        in:<br>
+        <a href="https://bitwarden.com/" style="text-decoration:none;color:#175ddc; font-weight:400">bitwarden.com</a> |
+        <a href="https://bitwarden.com/help/emails-from-bitwarden/" style="text-decoration:none; color:#175ddc; font-weight:400">Learn why we include this</a>
+      </p></div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    
+      </div>
+    
+  </body>
+</html>
+  
\ No newline at end of file
diff --git a/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.text.hbs b/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.text.hbs
new file mode 100644
index 000000000000..c666e287a554
--- /dev/null
+++ b/src/Core/Models/Mail/Provider/ProviderInvoiceUpcoming/ProviderInvoiceUpcomingMailView.text.hbs
@@ -0,0 +1,41 @@
+{{#>BasicTextLayout}}
+{{#if (eq CollectionMethod "send_invoice")}}
+Your subscription will renew soon
+
+On {{date DueDate 'MMMM dd, yyyy'}} we'll send you an invoice with a summary of the charges including tax.
+{{else}}
+Your subscription will renew on {{date DueDate 'MMMM dd, yyyy'}}
+
+    {{#if HasPaymentMethod}}
+To avoid any interruption in service, please ensure your {{PaymentMethodDescription}} can be charged for the following amount:
+    {{else}}
+To avoid any interruption in service, please add a payment method that can be charged for the following amount:
+    {{/if}}
+
+{{usd AmountDue}}
+{{/if}}
+{{#if Items}}
+{{#unless (eq CollectionMethod "send_invoice")}}
+
+Summary Of Charges
+------------------
+{{#each Items}}
+{{this}}
+{{/each}}
+{{/unless}}
+{{/if}}
+
+{{#if (eq CollectionMethod "send_invoice")}}
+To avoid any interruption in service for you or your clients, please pay the invoice by the due date, or contact Bitwarden Customer Support to sign up for auto-pay.
+
+Contact Bitwarden Support: {{{ContactUrl}}}
+
+For assistance managing your subscription, please visit the **Help center** (https://bitwarden.com/help/update-billing-info) or **contact Bitwarden Customer Support** (https://bitwarden.com/contact/).
+{{else}}
+
+{{/if}}
+
+{{#unless (eq CollectionMethod "send_invoice")}}
+For assistance managing your subscription, please visit the **Help center** (https://bitwarden.com/help/update-billing-info) or **contact Bitwarden Customer Support** (https://bitwarden.com/contact/).
+{{/unless}}
+{{/BasicTextLayout}}
\ No newline at end of file
diff --git a/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.cs b/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.cs
new file mode 100644
index 000000000000..616f678562c4
--- /dev/null
+++ b/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.cs
@@ -0,0 +1,28 @@
+using Bit.Core.Platform.Mail.Mailer;
+
+namespace Bit.Core.Models.Mail.Provider.ProviderUpdatePaymentMethod;
+
+#nullable enable
+
+/// <summary>
+/// Email sent to organization owners when their organization is removed from a provider,
+/// asking them to update their billing payment method.
+/// </summary>
+public class ProviderUpdatePaymentMethodMail : BaseMail<ProviderUpdatePaymentMethodMailView>
+{
+    public override string Subject { get; set; } = "Update your billing information";
+}
+
+/// <summary>
+/// View model for Provider Update Payment Method email template.
+/// </summary>
+public class ProviderUpdatePaymentMethodMailView : BaseMailView
+{
+    public required string OrganizationId { get; init; }
+    public required string OrganizationName { get; init; }
+    public required string ProviderName { get; init; }
+    public required string WebVaultUrl { get; init; }
+
+    public string PaymentMethodUrl =>
+        $"{WebVaultUrl}/organizations/{OrganizationId}/billing/payment-method";
+}
diff --git a/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.html.hbs b/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.html.hbs
new file mode 100644
index 000000000000..f32bb302db73
--- /dev/null
+++ b/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.html.hbs
@@ -0,0 +1,538 @@
+<!doctype html>
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+  <head>
+    <title></title>
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <!--<![endif]-->
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+      #outlook a { padding:0; }
+      body { margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%; }
+      table, td { border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt; }
+      img { border:0;height:auto;line-height:100%; outline:none;text-decoration:none;-ms-interpolation-mode:bicubic; }
+      p { display:block;margin:13px 0; }
+    </style>
+    <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+    <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+    
+    
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+        .mj-column-per-100 { width:100% !important; max-width: 100%; }
+.mj-column-per-70 { width:70% !important; max-width: 70%; }
+.mj-column-per-30 { width:30% !important; max-width: 30%; }
+      }
+    </style>
+    <style media="screen and (min-width:480px)">
+      .moz-text-html .mj-column-per-100 { width:100% !important; max-width: 100%; }
+.moz-text-html .mj-column-per-70 { width:70% !important; max-width: 70%; }
+.moz-text-html .mj-column-per-30 { width:30% !important; max-width: 30%; }
+    </style>
+    
+    
+  
+    
+    <style type="text/css">
+
+      @media only screen and (max-width:480px) {
+        .mj-bw-learn-more-footer-responsive-img {
+          display: none !important;
+        }
+      }
+    
+
+    @media only screen and (max-width:479px) {
+      table.mj-full-width-mobile { width: 100% !important; }
+      td.mj-full-width-mobile { width: auto !important; }
+    }
+  
+    </style>
+     
+    <style type="text/css">
+.border-fix > table {
+    border-collapse: separate !important;
+  }
+  .border-fix > table > tbody > tr > td {
+    border-radius: 3px;
+  }
+.body-link { color: #175ddc; text-decoration: underline; }
+    </style>
+    
+  </head>
+  <body style="word-spacing:normal;background-color:#e6e9ef;">
+    
+    
+      <div style="background-color:#e6e9ef;" lang="und" dir="auto">
+        
+      
+      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:660px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+        <tbody>
+          <tr>
+            <td style="width:250px;">
+              
+      <img alt src="https://bitwarden.com/images/logo-horizontal-blue.png" style="border:0;display:block;outline:none;text-decoration:none;height:39px;width:100%;font-size:16px;" width="250" height="39">
+    
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="border-fix-outlook" role="presentation" style="width:660px;" width="660" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div class="border-fix" style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
+          <tbody>
+            <tr>
+              <td style="border:1px solid #e9e9e9;direction:ltr;font-size:0px;padding:0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:658px;" width="658" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:658px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:658px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;">Your organization, {{OrganizationName}}, is no longer managed by {{ProviderName}}. Please update your billing information.</div>
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;">To maintain your subscription, update your organization billing information by navigating to the web vault -> Organization -> Billing ->
+                        <a href="{{{PaymentMethodUrl}}}" target="_blank" clicktracking="off" class="body-link">Payment Method</a>.</div>
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:1;text-align:left;color:#1B2029;">For more information, please refer to the following help article:
+                        <a href="https://bitwarden.com/help/update-billing-info/#update-billing-information-for-organizations" target="_blank" clicktracking="off" class="body-link">Update billing information for organizations</a></div>
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+        <tbody>
+          <tr>
+            <td align="center" bgcolor="#175ddc" role="presentation" style="border:none;border-radius:5px;cursor:auto;mso-padding-alt:10px 25px;background:#175ddc;" valign="middle">
+              <a href="{{{PaymentMethodUrl}}}" style="display:inline-block;background:#175ddc;color:#ffffff;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:5px;" target="_blank">
+                Add payment method
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" width="660px" ><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" bgcolor="#F3F6F9" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="background:#F3F6F9;background-color:#F3F6F9;margin:0px auto;border-radius:0px 0px 4px 4px;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#F3F6F9;background-color:#F3F6F9;width:100%;border-radius:0px 0px 4px 4px;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:5px 10px 10px 10px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:448px;" ><![endif]-->
+            
+      <div class="mj-column-per-70 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:16px;line-height:24px;text-align:left;color:#1B2029;"><p style="font-size: 18px; line-height: 28px; font-weight: bold;">
+              Learn more about Bitwarden
+            </p>
+            Find user guides, product documentation, and videos on the
+            <a href="https://bitwarden.com/help/" class="link" style="text-decoration: none; color: #175ddc; font-weight: 600;"> Bitwarden Help Center</a>.</div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td><td class="" style="vertical-align:top;width:192px;" ><![endif]-->
+            
+      <div class="mj-column-per-30 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" class="mj-bw-learn-more-footer-responsive-img" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+        <tbody>
+          <tr>
+            <td style="width:94px;">
+              
+      <img alt src="https://assets.bitwarden.com/email/v1/spot-community.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:16px;" width="94" height="auto">
+    
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:660px;" width="660" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    
+      
+      <div style="margin:0px auto;max-width:660px;">
+        
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+          <tbody>
+            <tr>
+              <td style="direction:ltr;font-size:0px;padding:5px 20px 10px 20px;text-align:center;">
+                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:620px;" ><![endif]-->
+            
+      <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+        
+      <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+        <tbody>
+          
+              <tr>
+                <td align="center" style="font-size:0px;padding:0;word-break:break-word;">
+                  
+      
+     <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" ><tr><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://x.com/bitwarden" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-x-twitter.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.reddit.com/r/Bitwarden/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-reddit.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://community.bitwarden.com/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-discourse.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://github.com/bitwarden" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-github.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.youtube.com/channel/UCId9a_jQqvJre0_dE2lE_Rw" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-youtube.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.linkedin.com/company/bitwarden1/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-linkedin.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td><td><![endif]-->
+              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="float:none;display:inline-table;">
+                <tbody>
+                  
+      <tr>
+        <td style="padding:8px;vertical-align:middle;">
+          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-radius:3px;width:24px;">
+            <tbody>
+              <tr>
+                <td style="font-size:0;height:24px;vertical-align:middle;width:24px;">
+                  <a href="https://www.facebook.com/bitwarden/" target="_blank">
+                    <img alt height="24" src="https://assets.bitwarden.com/email/v1/social-icons-facebook.png" style="border-radius:3px;display:block;" width="24">
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        
+      </tr>
+    
+                </tbody>
+              </table>
+            <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    
+                </td>
+              </tr>
+            
+              <tr>
+                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                  
+      <div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:12px;line-height:16px;text-align:center;color:#5A6D91;"><p style="margin-bottom: 5px; margin-top: 5px">
+        © {{ CurrentYear }} Bitwarden Inc. 1 N. Calle Cesar Chavez, Suite 102, Santa
+        Barbara, CA, USA
+      </p>
+      <p style="margin-top: 5px">
+        Always confirm you are on a trusted Bitwarden domain before logging
+        in:<br>
+        <a href="https://bitwarden.com/" style="text-decoration:none;color:#175ddc; font-weight:400">bitwarden.com</a> |
+        <a href="https://bitwarden.com/help/emails-from-bitwarden/" style="text-decoration:none; color:#175ddc; font-weight:400">Learn why we include this</a>
+      </p></div>
+    
+                </td>
+              </tr>
+            
+        </tbody>
+      </table>
+    
+      </div>
+    
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+      </div>
+    
+      
+      <!--[if mso | IE]></td></tr></table><![endif]-->
+    
+    
+      </div>
+    
+  </body>
+</html>
+  
\ No newline at end of file
diff --git a/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.text.hbs b/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.text.hbs
new file mode 100644
index 000000000000..1cc82c4ddac4
--- /dev/null
+++ b/src/Core/Models/Mail/Provider/ProviderUpdatePaymentMethod/ProviderUpdatePaymentMethodMailView.text.hbs
@@ -0,0 +1,5 @@
+Your organization, {{OrganizationName}}, is no longer managed by {{ProviderName}}. Please update your billing information.
+
+To maintain your subscription, update your organization billing information by navigating to the web vault -> Organization -> Billing -> Payment Method.
+
+Or click the following link: {{{PaymentMethodUrl}}}
diff --git a/src/Core/Platform/Mail/IMailService.cs b/src/Core/Platform/Mail/IMailService.cs
index e07e4bad2994..32f3193fd664 100644
--- a/src/Core/Platform/Mail/IMailService.cs
+++ b/src/Core/Platform/Mail/IMailService.cs
@@ -88,6 +88,7 @@ Task SendInvoiceUpcoming(
         DateTime dueDate,
         List<string> items,
         bool mentionInvoices);
+    [Obsolete("Use IMailer with ProviderInvoiceUpcomingMail instead")]
     Task SendProviderInvoiceUpcoming(
         IEnumerable<string> emails,
         decimal amount,
@@ -112,10 +113,12 @@ Task SendProviderInvoiceUpcoming(
     Task SendEnqueuedMailMessageAsync(IMailQueueMessage queueMessage);
     Task SendAdminResetPasswordEmailAsync(string email, string? userName, string orgName);
     Task SendProviderSetupInviteEmailAsync(Provider provider, string token, string email);
+    [Obsolete("Use IMailer with BusinessUnitConversionInviteMail instead")]
     Task SendBusinessUnitConversionInviteAsync(Organization organization, string token, string email);
     Task SendProviderInviteEmailAsync(string providerName, ProviderUser providerUser, string token, string email);
     Task SendProviderConfirmedEmailAsync(string providerName, string email);
     Task SendProviderUserRemoved(string providerName, string email);
+    [Obsolete("Use IMailer with ProviderUpdatePaymentMethodMail instead")]
     Task SendProviderUpdatePaymentMethod(
         Guid organizationId,
         string organizationName,
diff --git a/src/Core/Platform/Mail/Mailer/HandlebarMailRenderer.cs b/src/Core/Platform/Mail/Mailer/HandlebarMailRenderer.cs
index 8b4e0bd5dfc6..a8e6e6476076 100644
--- a/src/Core/Platform/Mail/Mailer/HandlebarMailRenderer.cs
+++ b/src/Core/Platform/Mail/Mailer/HandlebarMailRenderer.cs
@@ -139,6 +139,45 @@ private async Task<IHandlebars> InitializeHandlebarsAsync()
         var titleContactUsTextLayoutSource = await ReadSourceAsync(assembly, "Bit.Core.MailTemplates.Handlebars.Layouts.TitleContactUs.text.hbs");
         handlebars.RegisterTemplate("TitleContactUsTextLayout", titleContactUsTextLayoutSource);
 
+        // Register custom helpers used by mail templates.
+        handlebars.RegisterHelper("date", (writer, context, parameters) =>
+        {
+            if (parameters.Length == 0 || parameters[0] is not DateTime)
+            {
+                writer.WriteSafeString(string.Empty);
+                return;
+            }
+            if (parameters.Length > 1 && parameters[1] is string format)
+            {
+                writer.WriteSafeString(((DateTime)parameters[0]).ToString(format));
+            }
+            else
+            {
+                writer.WriteSafeString(((DateTime)parameters[0]).ToString());
+            }
+        });
+
+        handlebars.RegisterHelper("usd", (writer, context, parameters) =>
+        {
+            if (parameters.Length == 0 || parameters[0] is not decimal)
+            {
+                writer.WriteSafeString(string.Empty);
+                return;
+            }
+            writer.WriteSafeString(((decimal)parameters[0]).ToString("C"));
+        });
+
+        handlebars.RegisterHelper("eq", (context, arguments) =>
+        {
+            if (arguments.Length != 2)
+            {
+                return false;
+            }
+            var value1 = arguments[0]?.ToString();
+            var value2 = arguments[1]?.ToString();
+            return string.Equals(value1, value2, StringComparison.OrdinalIgnoreCase);
+        });
+
         return handlebars;
     }
 }
diff --git a/test/Billing.Test/Services/UpcomingInvoiceHandlerTests.cs b/test/Billing.Test/Services/UpcomingInvoiceHandlerTests.cs
index 82d6c8acfd49..228d4ceee966 100644
--- a/test/Billing.Test/Services/UpcomingInvoiceHandlerTests.cs
+++ b/test/Billing.Test/Services/UpcomingInvoiceHandlerTests.cs
@@ -14,6 +14,7 @@
 using Bit.Core.Models.Mail.Billing.Renewal.Families2019Renewal;
 using Bit.Core.Models.Mail.Billing.Renewal.Families2020Renewal;
 using Bit.Core.Models.Mail.Billing.Renewal.Premium;
+using Bit.Core.Models.Mail.Provider.ProviderInvoiceUpcoming;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
 using Bit.Core.Platform.Mail.Mailer;
 using Bit.Core.Repositories;
@@ -617,14 +618,15 @@ await _stripeFacade.Received(1).UpdateSubscription(
             Arg.Is<SubscriptionUpdateOptions>(o => o.AutomaticTax.Enabled == true));
 
         // Verify provider invoice email was sent
-        await _mailService.Received(1).SendProviderInvoiceUpcoming(
-            Arg.Is<IEnumerable<string>>(e => e.Contains("provider@example.com")),
-            Arg.Is<decimal>(amount => amount == invoice.AmountDue / 100M),
-            Arg.Is<DateTime>(dueDate => dueDate == invoice.NextPaymentAttempt.Value),
-            Arg.Is<List<string>>(items => items.Count == invoice.Lines.Data.Count),
-            Arg.Is<string>(s => s == subscription.CollectionMethod),
-            Arg.Is<bool>(b => b == true),
-            Arg.Is<string>(s => s == $"{paymentMethod.Brand} ending in {paymentMethod.Last4}"));
+        await _mailer.Received(1).SendEmail(
+            Arg.Is<ProviderInvoiceUpcomingMail>(m =>
+                m.ToEmails.Contains("provider@example.com") &&
+                m.View.AmountDue == invoice.AmountDue / 100M &&
+                m.View.DueDate == invoice.NextPaymentAttempt.Value &&
+                m.View.Items.Count == invoice.Lines.Data.Count &&
+                m.View.CollectionMethod == subscription.CollectionMethod &&
+                m.View.HasPaymentMethod == true &&
+                m.View.PaymentMethodDescription == $"{paymentMethod.Brand} ending in {paymentMethod.Last4}"));
     }
 
     [Fact]
@@ -944,14 +946,7 @@ public async Task HandleAsync_WhenProviderNotFound_DoesNothing()
         await _providerRepository.Received(1).GetByIdAsync(_providerId);
 
         // Verify no provider emails were sent
-        await _mailService.DidNotReceive().SendProviderInvoiceUpcoming(
-            Arg.Any<IEnumerable<string>>(),
-            Arg.Any<decimal>(),
-            Arg.Any<DateTime>(),
-            Arg.Any<List<string>>(),
-            Arg.Any<string>(),
-            Arg.Any<bool>(),
-            Arg.Any<string>());
+        await _mailer.DidNotReceive().SendEmail(Arg.Any<ProviderInvoiceUpcomingMail>());
     }
 
     [Fact]