diff --git a/bitwarden_license/src/Commercial.Core/Billing/Providers/Models/ProviderClientInvoiceReportRow.cs b/bitwarden_license/src/Commercial.Core/Billing/Providers/Models/ProviderClientInvoiceReportRow.cs
index eea40577ad..5fff607f79 100644
--- a/bitwarden_license/src/Commercial.Core/Billing/Providers/Models/ProviderClientInvoiceReportRow.cs
+++ b/bitwarden_license/src/Commercial.Core/Billing/Providers/Models/ProviderClientInvoiceReportRow.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using Bit.Core.Billing.Providers.Entities;
using CsvHelper.Configuration.Attributes;
diff --git a/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs b/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs
index 2b337fb4bb..e02b52cd46 100644
--- a/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs
+++ b/bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using Bit.Commercial.Core.Billing.Providers.Models;
using Bit.Core;
using Bit.Core.AdminConsole.Entities;
diff --git a/src/Admin/Billing/Controllers/ProcessStripeEventsController.cs b/src/Admin/Billing/Controllers/ProcessStripeEventsController.cs
index 1a3f56a183..80ad7fef4e 100644
--- a/src/Admin/Billing/Controllers/ProcessStripeEventsController.cs
+++ b/src/Admin/Billing/Controllers/ProcessStripeEventsController.cs
@@ -1,4 +1,7 @@
-using System.Text.Json;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json;
using Bit.Admin.Billing.Models.ProcessStripeEvents;
using Bit.Core.Settings;
using Bit.Core.Utilities;
diff --git a/src/Admin/Billing/Models/MigrateProvidersRequestModel.cs b/src/Admin/Billing/Models/MigrateProvidersRequestModel.cs
index fe1d88e224..273f934eba 100644
--- a/src/Admin/Billing/Models/MigrateProvidersRequestModel.cs
+++ b/src/Admin/Billing/Models/MigrateProvidersRequestModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Billing.Models;
diff --git a/src/Admin/Billing/Models/ProcessStripeEvents/EventsFormModel.cs b/src/Admin/Billing/Models/ProcessStripeEvents/EventsFormModel.cs
index 5ead00e263..b78d8cc89e 100644
--- a/src/Admin/Billing/Models/ProcessStripeEvents/EventsFormModel.cs
+++ b/src/Admin/Billing/Models/ProcessStripeEvents/EventsFormModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace Bit.Admin.Billing.Models.ProcessStripeEvents;
diff --git a/src/Admin/Billing/Models/ProcessStripeEvents/EventsRequestBody.cs b/src/Admin/Billing/Models/ProcessStripeEvents/EventsRequestBody.cs
index 05a2444605..ea9b9c1045 100644
--- a/src/Admin/Billing/Models/ProcessStripeEvents/EventsRequestBody.cs
+++ b/src/Admin/Billing/Models/ProcessStripeEvents/EventsRequestBody.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Admin.Billing.Models.ProcessStripeEvents;
diff --git a/src/Admin/Billing/Models/ProcessStripeEvents/EventsResponseBody.cs b/src/Admin/Billing/Models/ProcessStripeEvents/EventsResponseBody.cs
index 84eeb35d29..5c55b3a8b4 100644
--- a/src/Admin/Billing/Models/ProcessStripeEvents/EventsResponseBody.cs
+++ b/src/Admin/Billing/Models/ProcessStripeEvents/EventsResponseBody.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Admin.Billing.Models.ProcessStripeEvents;
diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs
index eaf3de4be5..a640fe352f 100644
--- a/src/Admin/Controllers/ToolsController.cs
+++ b/src/Admin/Controllers/ToolsController.cs
@@ -1,4 +1,7 @@
-using System.Text;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text;
using System.Text.Json;
using Bit.Admin.Enums;
using Bit.Admin.Models;
diff --git a/src/Admin/Views/Tools/ChargeBraintree.cshtml b/src/Admin/Views/Tools/ChargeBraintree.cshtml
index aaf3bbf167..0c661a8ee4 100644
--- a/src/Admin/Views/Tools/ChargeBraintree.cshtml
+++ b/src/Admin/Views/Tools/ChargeBraintree.cshtml
@@ -8,7 +8,7 @@
@if(!string.IsNullOrWhiteSpace(Model.TransactionId))
{
-
Charged customer "@Model.Id" for @Model.Amount.Value.ToString("C").
+
Charged customer "@Model.Id" for @Model.Amount!.Value.ToString("C").
btTransactionId: @Model.TransactionId
btPayPalTransactionId: @Model.PayPalTransactionId
diff --git a/src/Api/Billing/Controllers/BaseProviderController.cs b/src/Api/Billing/Controllers/BaseProviderController.cs
index 038abfaa9e..782bffbc70 100644
--- a/src/Api/Billing/Controllers/BaseProviderController.cs
+++ b/src/Api/Billing/Controllers/BaseProviderController.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities.Provider;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Repositories;
using Bit.Core.Billing.Extensions;
using Bit.Core.Context;
diff --git a/src/Api/Billing/Controllers/InvoicesController.cs b/src/Api/Billing/Controllers/InvoicesController.cs
index 5a1d732f42..30ea975e09 100644
--- a/src/Api/Billing/Controllers/InvoicesController.cs
+++ b/src/Api/Billing/Controllers/InvoicesController.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Tax.Requests;
using Bit.Core.Context;
using Bit.Core.Repositories;
diff --git a/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs b/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
index c45b34422c..2d05595b2d 100644
--- a/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
+++ b/src/Api/Billing/Controllers/OrganizationSponsorshipsController.cs
@@ -1,4 +1,7 @@
-using Bit.Api.Models.Request.Organizations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
using Bit.Api.Models.Response.Organizations;
using Bit.Core.AdminConsole.Enums;
diff --git a/src/Api/Billing/Controllers/OrganizationsController.cs b/src/Api/Billing/Controllers/OrganizationsController.cs
index c8a3c20c91..a74974ab46 100644
--- a/src/Api/Billing/Controllers/OrganizationsController.cs
+++ b/src/Api/Billing/Controllers/OrganizationsController.cs
@@ -1,4 +1,7 @@
-using Bit.Api.AdminConsole.Models.Request.Organizations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Response;
using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Api.Models.Request;
diff --git a/src/Api/Billing/Controllers/ProviderBillingController.cs b/src/Api/Billing/Controllers/ProviderBillingController.cs
index 1309b2df6d..80b145a2e0 100644
--- a/src/Api/Billing/Controllers/ProviderBillingController.cs
+++ b/src/Api/Billing/Controllers/ProviderBillingController.cs
@@ -1,4 +1,7 @@
-using Bit.Api.Billing.Models.Requests;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Api.Billing.Models.Requests;
using Bit.Api.Billing.Models.Responses;
using Bit.Commercial.Core.Billing.Providers.Services;
using Bit.Core;
diff --git a/src/Api/Billing/Models/Requests/AddExistingOrganizationRequestBody.cs b/src/Api/Billing/Models/Requests/AddExistingOrganizationRequestBody.cs
index c2add17793..f23ce266c8 100644
--- a/src/Api/Billing/Models/Requests/AddExistingOrganizationRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/AddExistingOrganizationRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Requests/CreateClientOrganizationRequestBody.cs b/src/Api/Billing/Models/Requests/CreateClientOrganizationRequestBody.cs
index 95836151d6..243126f7ac 100644
--- a/src/Api/Billing/Models/Requests/CreateClientOrganizationRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/CreateClientOrganizationRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
using Bit.Api.Utilities;
using Bit.Core.Billing.Enums;
diff --git a/src/Api/Billing/Models/Requests/KeyPairRequestBody.cs b/src/Api/Billing/Models/Requests/KeyPairRequestBody.cs
index b4f2c00f4f..2fec3bd61d 100644
--- a/src/Api/Billing/Models/Requests/KeyPairRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/KeyPairRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Requests/SetupBusinessUnitRequestBody.cs b/src/Api/Billing/Models/Requests/SetupBusinessUnitRequestBody.cs
index c4b87a01f5..bbc6a9acda 100644
--- a/src/Api/Billing/Models/Requests/SetupBusinessUnitRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/SetupBusinessUnitRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Requests/TaxInformationRequestBody.cs b/src/Api/Billing/Models/Requests/TaxInformationRequestBody.cs
index edc45ce483..a1b754a9dc 100644
--- a/src/Api/Billing/Models/Requests/TaxInformationRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/TaxInformationRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
using Bit.Core.Billing.Tax.Models;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Requests/TokenizedPaymentSourceRequestBody.cs b/src/Api/Billing/Models/Requests/TokenizedPaymentSourceRequestBody.cs
index 4f087913b9..b469ce2576 100644
--- a/src/Api/Billing/Models/Requests/TokenizedPaymentSourceRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/TokenizedPaymentSourceRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
using Bit.Api.Utilities;
using Bit.Core.Billing.Models;
using Bit.Core.Enums;
diff --git a/src/Api/Billing/Models/Requests/UpdateClientOrganizationRequestBody.cs b/src/Api/Billing/Models/Requests/UpdateClientOrganizationRequestBody.cs
index 6ed1083b42..7c393e342a 100644
--- a/src/Api/Billing/Models/Requests/UpdateClientOrganizationRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/UpdateClientOrganizationRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Requests/UpdatePaymentMethodRequestBody.cs b/src/Api/Billing/Models/Requests/UpdatePaymentMethodRequestBody.cs
index cdc9a08851..05ab1e34c9 100644
--- a/src/Api/Billing/Models/Requests/UpdatePaymentMethodRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/UpdatePaymentMethodRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Requests/VerifyBankAccountRequestBody.cs b/src/Api/Billing/Models/Requests/VerifyBankAccountRequestBody.cs
index 3e97d07a90..e248d55dde 100644
--- a/src/Api/Billing/Models/Requests/VerifyBankAccountRequestBody.cs
+++ b/src/Api/Billing/Models/Requests/VerifyBankAccountRequestBody.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Models.Requests;
diff --git a/src/Api/Billing/Models/Responses/BillingHistoryResponseModel.cs b/src/Api/Billing/Models/Responses/BillingHistoryResponseModel.cs
index 0a4ebdb8dd..9f68fe41a4 100644
--- a/src/Api/Billing/Models/Responses/BillingHistoryResponseModel.cs
+++ b/src/Api/Billing/Models/Responses/BillingHistoryResponseModel.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Models;
using Bit.Core.Enums;
using Bit.Core.Models.Api;
diff --git a/src/Api/Billing/Models/Responses/BillingPaymentResponseModel.cs b/src/Api/Billing/Models/Responses/BillingPaymentResponseModel.cs
index 5c43522aca..f305e41c4f 100644
--- a/src/Api/Billing/Models/Responses/BillingPaymentResponseModel.cs
+++ b/src/Api/Billing/Models/Responses/BillingPaymentResponseModel.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Models;
using Bit.Core.Models.Api;
namespace Bit.Api.Billing.Models.Responses;
diff --git a/src/Api/Billing/Models/Responses/BillingResponseModel.cs b/src/Api/Billing/Models/Responses/BillingResponseModel.cs
index 172f784b50..67f4c98f9d 100644
--- a/src/Api/Billing/Models/Responses/BillingResponseModel.cs
+++ b/src/Api/Billing/Models/Responses/BillingResponseModel.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Models;
using Bit.Core.Enums;
using Bit.Core.Models.Api;
diff --git a/src/Api/Billing/Public/Controllers/OrganizationController.cs b/src/Api/Billing/Public/Controllers/OrganizationController.cs
index b0a0537ed8..79033ba31e 100644
--- a/src/Api/Billing/Public/Controllers/OrganizationController.cs
+++ b/src/Api/Billing/Public/Controllers/OrganizationController.cs
@@ -1,4 +1,7 @@
-using System.Net;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Net;
using Bit.Api.Billing.Public.Models;
using Bit.Api.Models.Public.Response;
using Bit.Core.Billing.Pricing;
diff --git a/src/Api/Billing/Public/Models/Request/OrganizationSubscriptionUpdateRequestModel.cs b/src/Api/Billing/Public/Models/Request/OrganizationSubscriptionUpdateRequestModel.cs
index 5c75db5924..4ccbdb04e8 100644
--- a/src/Api/Billing/Public/Models/Request/OrganizationSubscriptionUpdateRequestModel.cs
+++ b/src/Api/Billing/Public/Models/Request/OrganizationSubscriptionUpdateRequestModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Models.Business;
using Bit.Core.Models.StaticStore;
diff --git a/src/Api/Billing/Public/Models/Response/OrganizationSubscriptionDetailsResponseModel.cs b/src/Api/Billing/Public/Models/Response/OrganizationSubscriptionDetailsResponseModel.cs
index 09aa7decc1..0a3b7b1421 100644
--- a/src/Api/Billing/Public/Models/Response/OrganizationSubscriptionDetailsResponseModel.cs
+++ b/src/Api/Billing/Public/Models/Response/OrganizationSubscriptionDetailsResponseModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Api.Billing.Public.Models;
diff --git a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs
index ed501c41da..a0cc64b9bf 100644
--- a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs
+++ b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs
@@ -1,4 +1,7 @@
-using Bit.Api.AdminConsole.Models.Response.Organizations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Api.Models.Request;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Utilities;
diff --git a/src/Billing/BillingSettings.cs b/src/Billing/BillingSettings.cs
index ffe73808d4..9189fe6cd0 100644
--- a/src/Billing/BillingSettings.cs
+++ b/src/Billing/BillingSettings.cs
@@ -1,4 +1,7 @@
-namespace Bit.Billing;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Billing;
public class BillingSettings
{
diff --git a/src/Billing/Controllers/AppleController.cs b/src/Billing/Controllers/AppleController.cs
index 5c231de8ed..c08f1cfa61 100644
--- a/src/Billing/Controllers/AppleController.cs
+++ b/src/Billing/Controllers/AppleController.cs
@@ -1,4 +1,7 @@
-using System.Text;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text;
using System.Text.Json;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Billing/Controllers/BitPayController.cs b/src/Billing/Controllers/BitPayController.cs
index a8d1742fcb..111ffabc2b 100644
--- a/src/Billing/Controllers/BitPayController.cs
+++ b/src/Billing/Controllers/BitPayController.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using Bit.Billing.Constants;
using Bit.Billing.Models;
using Bit.Core.AdminConsole.Repositories;
diff --git a/src/Billing/Controllers/FreshdeskController.cs b/src/Billing/Controllers/FreshdeskController.cs
index 1fb0fb7ac7..40c9c39d95 100644
--- a/src/Billing/Controllers/FreshdeskController.cs
+++ b/src/Billing/Controllers/FreshdeskController.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
using System.Net.Http.Headers;
using System.Reflection;
using System.Text;
diff --git a/src/Billing/Controllers/FreshsalesController.cs b/src/Billing/Controllers/FreshsalesController.cs
index 0182011d7a..be5a9ddb16 100644
--- a/src/Billing/Controllers/FreshsalesController.cs
+++ b/src/Billing/Controllers/FreshsalesController.cs
@@ -1,4 +1,7 @@
-using System.Net.Http.Headers;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Net.Http.Headers;
using System.Text.Json.Serialization;
using Bit.Core.Billing.Enums;
using Bit.Core.Repositories;
diff --git a/src/Billing/Controllers/PayPalController.cs b/src/Billing/Controllers/PayPalController.cs
index 36987c6e44..8039680fd5 100644
--- a/src/Billing/Controllers/PayPalController.cs
+++ b/src/Billing/Controllers/PayPalController.cs
@@ -1,4 +1,7 @@
-using System.Text;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text;
using Bit.Billing.Models;
using Bit.Core.AdminConsole.Repositories;
using Bit.Core.Billing.Services;
diff --git a/src/Billing/Controllers/RecoveryController.cs b/src/Billing/Controllers/RecoveryController.cs
index bada1e826d..3f3dc4e650 100644
--- a/src/Billing/Controllers/RecoveryController.cs
+++ b/src/Billing/Controllers/RecoveryController.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Models.Recovery;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Models.Recovery;
using Bit.Billing.Services;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Http.HttpResults;
diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs
index 5ea2733a18..b60e0c56e4 100644
--- a/src/Billing/Controllers/StripeController.cs
+++ b/src/Billing/Controllers/StripeController.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Models;
using Bit.Billing.Services;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Billing/Jobs/SubscriptionCancellationJob.cs b/src/Billing/Jobs/SubscriptionCancellationJob.cs
index b59bb10eaf..69b7bc876d 100644
--- a/src/Billing/Jobs/SubscriptionCancellationJob.cs
+++ b/src/Billing/Jobs/SubscriptionCancellationJob.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Services;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Services;
using Bit.Core.Repositories;
using Quartz;
using Stripe;
diff --git a/src/Billing/Models/BitPayEventModel.cs b/src/Billing/Models/BitPayEventModel.cs
index e16391317a..008d4942a6 100644
--- a/src/Billing/Models/BitPayEventModel.cs
+++ b/src/Billing/Models/BitPayEventModel.cs
@@ -1,4 +1,7 @@
-namespace Bit.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Billing.Models;
public class BitPayEventModel
{
diff --git a/src/Billing/Models/FreshdeskViewTicketModel.cs b/src/Billing/Models/FreshdeskViewTicketModel.cs
index 2aa6eff94d..e4d485072c 100644
--- a/src/Billing/Models/FreshdeskViewTicketModel.cs
+++ b/src/Billing/Models/FreshdeskViewTicketModel.cs
@@ -1,4 +1,7 @@
-namespace Bit.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Billing.Models;
using System;
using System.Collections.Generic;
diff --git a/src/Billing/Models/FreshdeskWebhookModel.cs b/src/Billing/Models/FreshdeskWebhookModel.cs
index e9fe8e026a..19c94d5eba 100644
--- a/src/Billing/Models/FreshdeskWebhookModel.cs
+++ b/src/Billing/Models/FreshdeskWebhookModel.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Billing.Models;
diff --git a/src/Billing/Models/LoginModel.cs b/src/Billing/Models/LoginModel.cs
index 5fe04ad454..f758dc8590 100644
--- a/src/Billing/Models/LoginModel.cs
+++ b/src/Billing/Models/LoginModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Billing.Models;
diff --git a/src/Billing/Models/OnyxAnswerWithCitationRequestModel.cs b/src/Billing/Models/OnyxAnswerWithCitationRequestModel.cs
index e7bd29b2f5..c21ea9fc19 100644
--- a/src/Billing/Models/OnyxAnswerWithCitationRequestModel.cs
+++ b/src/Billing/Models/OnyxAnswerWithCitationRequestModel.cs
@@ -1,4 +1,7 @@
-
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+
using System.Text.Json.Serialization;
namespace Bit.Billing.Models;
diff --git a/src/Billing/Models/OnyxAnswerWithCitationResponseModel.cs b/src/Billing/Models/OnyxAnswerWithCitationResponseModel.cs
index e85ee9a674..5f67cd51d2 100644
--- a/src/Billing/Models/OnyxAnswerWithCitationResponseModel.cs
+++ b/src/Billing/Models/OnyxAnswerWithCitationResponseModel.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Billing.Models;
diff --git a/src/Billing/Models/PayPalIPNTransactionModel.cs b/src/Billing/Models/PayPalIPNTransactionModel.cs
index 6fd0dfa0c4..34db5fdd04 100644
--- a/src/Billing/Models/PayPalIPNTransactionModel.cs
+++ b/src/Billing/Models/PayPalIPNTransactionModel.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using System.Runtime.InteropServices;
using System.Web;
diff --git a/src/Billing/Models/Recovery/EventsRequestBody.cs b/src/Billing/Models/Recovery/EventsRequestBody.cs
index a40f8c9655..f3293cb48a 100644
--- a/src/Billing/Models/Recovery/EventsRequestBody.cs
+++ b/src/Billing/Models/Recovery/EventsRequestBody.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Billing.Models.Recovery;
diff --git a/src/Billing/Models/Recovery/EventsResponseBody.cs b/src/Billing/Models/Recovery/EventsResponseBody.cs
index a0c7f087b7..a706734133 100644
--- a/src/Billing/Models/Recovery/EventsResponseBody.cs
+++ b/src/Billing/Models/Recovery/EventsResponseBody.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Billing.Models.Recovery;
diff --git a/src/Billing/Models/StripeWebhookDeliveryContainer.cs b/src/Billing/Models/StripeWebhookDeliveryContainer.cs
index 6588aa7d13..9d566146fb 100644
--- a/src/Billing/Models/StripeWebhookDeliveryContainer.cs
+++ b/src/Billing/Models/StripeWebhookDeliveryContainer.cs
@@ -1,4 +1,7 @@
-using System.Text.Json.Serialization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json.Serialization;
namespace Bit.Billing.Models;
diff --git a/src/Billing/Services/IStripeEventService.cs b/src/Billing/Services/IStripeEventService.cs
index 6e2239cf98..bf242905ee 100644
--- a/src/Billing/Services/IStripeEventService.cs
+++ b/src/Billing/Services/IStripeEventService.cs
@@ -1,4 +1,7 @@
-using Stripe;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Stripe;
namespace Bit.Billing.Services;
diff --git a/src/Billing/Services/IStripeFacade.cs b/src/Billing/Services/IStripeFacade.cs
index e53d901083..6886250a33 100644
--- a/src/Billing/Services/IStripeFacade.cs
+++ b/src/Billing/Services/IStripeFacade.cs
@@ -1,4 +1,7 @@
-using Stripe;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Stripe;
namespace Bit.Billing.Services;
diff --git a/src/Billing/Services/Implementations/PaymentMethodAttachedHandler.cs b/src/Billing/Services/Implementations/PaymentMethodAttachedHandler.cs
index 97bb29c35d..ee5a50cc98 100644
--- a/src/Billing/Services/Implementations/PaymentMethodAttachedHandler.cs
+++ b/src/Billing/Services/Implementations/PaymentMethodAttachedHandler.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Constants;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Constants;
using Bit.Core;
using Bit.Core.AdminConsole.Enums.Provider;
using Bit.Core.AdminConsole.Repositories;
diff --git a/src/Billing/Services/Implementations/ProviderEventService.cs b/src/Billing/Services/Implementations/ProviderEventService.cs
index 1f6ef741df..12716c5aa2 100644
--- a/src/Billing/Services/Implementations/ProviderEventService.cs
+++ b/src/Billing/Services/Implementations/ProviderEventService.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Constants;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Constants;
using Bit.Core.AdminConsole.Repositories;
using Bit.Core.Billing.Pricing;
using Bit.Core.Billing.Providers.Entities;
diff --git a/src/Billing/Services/Implementations/StripeEventService.cs b/src/Billing/Services/Implementations/StripeEventService.cs
index 8d947e0ccb..7e2984e423 100644
--- a/src/Billing/Services/Implementations/StripeEventService.cs
+++ b/src/Billing/Services/Implementations/StripeEventService.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Constants;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Constants;
using Bit.Core.Settings;
using Stripe;
diff --git a/src/Billing/Services/Implementations/StripeEventUtilityService.cs b/src/Billing/Services/Implementations/StripeEventUtilityService.cs
index 48e81dee61..4c96bf977d 100644
--- a/src/Billing/Services/Implementations/StripeEventUtilityService.cs
+++ b/src/Billing/Services/Implementations/StripeEventUtilityService.cs
@@ -1,4 +1,7 @@
-using Bit.Billing.Constants;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Billing.Constants;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.Repositories;
diff --git a/src/Billing/Services/Implementations/StripeFacade.cs b/src/Billing/Services/Implementations/StripeFacade.cs
index 191f84a343..70144d8cd3 100644
--- a/src/Billing/Services/Implementations/StripeFacade.cs
+++ b/src/Billing/Services/Implementations/StripeFacade.cs
@@ -1,4 +1,7 @@
-using Stripe;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Stripe;
namespace Bit.Billing.Services.Implementations;
diff --git a/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs b/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
index e31d1dceb7..323eaf5155 100644
--- a/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
+++ b/src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
@@ -1,4 +1,7 @@
-using Bit.Core;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Repositories;
diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs
index afb01f4801..24b5372ba1 100644
--- a/src/Billing/Startup.cs
+++ b/src/Billing/Startup.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using System.Net.Http.Headers;
using Bit.Billing.Services;
using Bit.Billing.Services.Implementations;
diff --git a/src/Core/Billing/BillingException.cs b/src/Core/Billing/BillingException.cs
index c2b1b9f457..1203a15f7b 100644
--- a/src/Core/Billing/BillingException.cs
+++ b/src/Core/Billing/BillingException.cs
@@ -1,4 +1,7 @@
-namespace Bit.Core.Billing;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Core.Billing;
public class BillingException(
string response = null,
diff --git a/src/Core/Billing/Caches/Implementations/SetupIntentDistributedCache.cs b/src/Core/Billing/Caches/Implementations/SetupIntentDistributedCache.cs
index ceb512a0e3..432a778762 100644
--- a/src/Core/Billing/Caches/Implementations/SetupIntentDistributedCache.cs
+++ b/src/Core/Billing/Caches/Implementations/SetupIntentDistributedCache.cs
@@ -1,4 +1,7 @@
-using Microsoft.Extensions.Caching.Distributed;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.DependencyInjection;
namespace Bit.Core.Billing.Caches.Implementations;
diff --git a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
index 184d8dad23..9ac1ace156 100644
--- a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
+++ b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
@@ -1,4 +1,7 @@
-using System.Security.Claims;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Security.Claims;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Models.Business;
diff --git a/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs b/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
index b3f2ab4ec9..678ac7f97e 100644
--- a/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
+++ b/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using System.Security.Claims;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
diff --git a/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs b/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs
index 2aaa5efdc1..5ad1a4a294 100644
--- a/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs
+++ b/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs
@@ -1,4 +1,7 @@
-using System.Globalization;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Globalization;
using System.Security.Claims;
using Bit.Core.Billing.Licenses.Models;
using Bit.Core.Entities;
diff --git a/src/Core/Billing/Models/Api/Requests/Accounts/TrialSendVerificationEmailRequestModel.cs b/src/Core/Billing/Models/Api/Requests/Accounts/TrialSendVerificationEmailRequestModel.cs
index b31da9efbc..3392594f06 100644
--- a/src/Core/Billing/Models/Api/Requests/Accounts/TrialSendVerificationEmailRequestModel.cs
+++ b/src/Core/Billing/Models/Api/Requests/Accounts/TrialSendVerificationEmailRequestModel.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Auth.Models.Api.Request.Accounts;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Auth.Models.Api.Request.Accounts;
using Bit.Core.Billing.Enums;
namespace Bit.Core.Billing.Models.Api.Requests.Accounts;
diff --git a/src/Core/Billing/Models/BillingHistoryInfo.cs b/src/Core/Billing/Models/BillingHistoryInfo.cs
index 03017b9b4d..3114e22fdf 100644
--- a/src/Core/Billing/Models/BillingHistoryInfo.cs
+++ b/src/Core/Billing/Models/BillingHistoryInfo.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Entities;
using Bit.Core.Enums;
using Stripe;
diff --git a/src/Core/Billing/Models/BillingInfo.cs b/src/Core/Billing/Models/BillingInfo.cs
index 9bdc042570..5b7f2484be 100644
--- a/src/Core/Billing/Models/BillingInfo.cs
+++ b/src/Core/Billing/Models/BillingInfo.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Enums;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Enums;
using Stripe;
namespace Bit.Core.Billing.Models;
diff --git a/src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs b/src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
index 830105e373..4bcc7ed699 100644
--- a/src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
+++ b/src/Core/Billing/Models/Business/SponsorOrganizationSubscriptionUpdate.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Models.Business;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Models.Business;
using Stripe;
namespace Bit.Core.Billing.Models.Business;
diff --git a/src/Core/Billing/Models/Mail/TrialInititaionVerifyEmail.cs b/src/Core/Billing/Models/Mail/TrialInititaionVerifyEmail.cs
index b97390dcc9..019edccd04 100644
--- a/src/Core/Billing/Models/Mail/TrialInititaionVerifyEmail.cs
+++ b/src/Core/Billing/Models/Mail/TrialInititaionVerifyEmail.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Auth.Models.Mail;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Auth.Models.Mail;
using Bit.Core.Billing.Enums;
using Bit.Core.Enums;
diff --git a/src/Core/Billing/Models/OffboardingSurveyResponse.cs b/src/Core/Billing/Models/OffboardingSurveyResponse.cs
index cd966f40cc..0d55dcdc56 100644
--- a/src/Core/Billing/Models/OffboardingSurveyResponse.cs
+++ b/src/Core/Billing/Models/OffboardingSurveyResponse.cs
@@ -1,4 +1,7 @@
-namespace Bit.Core.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Core.Billing.Models;
public class OffboardingSurveyResponse
{
diff --git a/src/Core/Billing/Models/PaymentMethod.cs b/src/Core/Billing/Models/PaymentMethod.cs
index 2b8c59fa05..14ee79b714 100644
--- a/src/Core/Billing/Models/PaymentMethod.cs
+++ b/src/Core/Billing/Models/PaymentMethod.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Tax.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Tax.Models;
namespace Bit.Core.Billing.Models;
diff --git a/src/Core/Billing/Models/PaymentSource.cs b/src/Core/Billing/Models/PaymentSource.cs
index 44bbddc66b..130b0f71c4 100644
--- a/src/Core/Billing/Models/PaymentSource.cs
+++ b/src/Core/Billing/Models/PaymentSource.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Extensions;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Extensions;
using Bit.Core.Enums;
namespace Bit.Core.Billing.Models;
diff --git a/src/Core/Billing/Models/StaticStore/Plan.cs b/src/Core/Billing/Models/StaticStore/Plan.cs
index d710594f46..540ea76582 100644
--- a/src/Core/Billing/Models/StaticStore/Plan.cs
+++ b/src/Core/Billing/Models/StaticStore/Plan.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Enums;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Enums;
namespace Bit.Core.Models.StaticStore;
diff --git a/src/Core/Billing/Models/StaticStore/SponsoredPlan.cs b/src/Core/Billing/Models/StaticStore/SponsoredPlan.cs
index d0d98159a8..840a652225 100644
--- a/src/Core/Billing/Models/StaticStore/SponsoredPlan.cs
+++ b/src/Core/Billing/Models/StaticStore/SponsoredPlan.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Enums;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Enums;
using Bit.Core.Enums;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
diff --git a/src/Core/Billing/Providers/Migration/Models/ClientMigrationTracker.cs b/src/Core/Billing/Providers/Migration/Models/ClientMigrationTracker.cs
index ae0c28de86..65fd7726f8 100644
--- a/src/Core/Billing/Providers/Migration/Models/ClientMigrationTracker.cs
+++ b/src/Core/Billing/Providers/Migration/Models/ClientMigrationTracker.cs
@@ -1,4 +1,7 @@
-namespace Bit.Core.Billing.Providers.Migration.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Core.Billing.Providers.Migration.Models;
public enum ClientMigrationProgress
{
diff --git a/src/Core/Billing/Providers/Migration/Models/ProviderMigrationResult.cs b/src/Core/Billing/Providers/Migration/Models/ProviderMigrationResult.cs
index 6f3c3be11d..78a2631999 100644
--- a/src/Core/Billing/Providers/Migration/Models/ProviderMigrationResult.cs
+++ b/src/Core/Billing/Providers/Migration/Models/ProviderMigrationResult.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Providers.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Providers.Entities;
namespace Bit.Core.Billing.Providers.Migration.Models;
diff --git a/src/Core/Billing/Providers/Migration/Models/ProviderMigrationTracker.cs b/src/Core/Billing/Providers/Migration/Models/ProviderMigrationTracker.cs
index f4708d4cbd..ba39feab2d 100644
--- a/src/Core/Billing/Providers/Migration/Models/ProviderMigrationTracker.cs
+++ b/src/Core/Billing/Providers/Migration/Models/ProviderMigrationTracker.cs
@@ -1,4 +1,7 @@
-namespace Bit.Core.Billing.Providers.Migration.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Core.Billing.Providers.Migration.Models;
public enum ProviderMigrationProgress
{
diff --git a/src/Core/Billing/Providers/Migration/Services/Implementations/MigrationTrackerDistributedCache.cs b/src/Core/Billing/Providers/Migration/Services/Implementations/MigrationTrackerDistributedCache.cs
index ea7d118cfa..1f38b0d111 100644
--- a/src/Core/Billing/Providers/Migration/Services/Implementations/MigrationTrackerDistributedCache.cs
+++ b/src/Core/Billing/Providers/Migration/Services/Implementations/MigrationTrackerDistributedCache.cs
@@ -1,4 +1,7 @@
-using System.Text.Json;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.Json;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.Billing.Providers.Migration.Models;
diff --git a/src/Core/Billing/Providers/Migration/Services/Implementations/OrganizationMigrator.cs b/src/Core/Billing/Providers/Migration/Services/Implementations/OrganizationMigrator.cs
index 3b874579e5..3de49838af 100644
--- a/src/Core/Billing/Providers/Migration/Services/Implementations/OrganizationMigrator.cs
+++ b/src/Core/Billing/Providers/Migration/Services/Implementations/OrganizationMigrator.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Pricing;
diff --git a/src/Core/Billing/Providers/Migration/Services/Implementations/ProviderMigrator.cs b/src/Core/Billing/Providers/Migration/Services/Implementations/ProviderMigrator.cs
index 3a0b579dcf..3a33f96dab 100644
--- a/src/Core/Billing/Providers/Migration/Services/Implementations/ProviderMigrator.cs
+++ b/src/Core/Billing/Providers/Migration/Services/Implementations/ProviderMigrator.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Enums.Provider;
using Bit.Core.AdminConsole.Repositories;
diff --git a/src/Core/Billing/Providers/Services/IProviderBillingService.cs b/src/Core/Billing/Providers/Services/IProviderBillingService.cs
index b634f1a81c..518fa1ba98 100644
--- a/src/Core/Billing/Providers/Services/IProviderBillingService.cs
+++ b/src/Core/Billing/Providers/Services/IProviderBillingService.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Models;
diff --git a/src/Core/Billing/Services/ISubscriberService.cs b/src/Core/Billing/Services/ISubscriberService.cs
index 6910948436..ef43bde010 100644
--- a/src/Core/Billing/Services/ISubscriberService.cs
+++ b/src/Core/Billing/Services/ISubscriberService.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Models;
using Bit.Core.Billing.Tax.Models;
using Bit.Core.Entities;
using Bit.Core.Enums;
diff --git a/src/Core/Billing/Services/Implementations/PremiumUserBillingService.cs b/src/Core/Billing/Services/Implementations/PremiumUserBillingService.cs
index 7496157aaa..5b1b717c20 100644
--- a/src/Core/Billing/Services/Implementations/PremiumUserBillingService.cs
+++ b/src/Core/Billing/Services/Implementations/PremiumUserBillingService.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Caches;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Caches;
using Bit.Core.Billing.Constants;
using Bit.Core.Billing.Models;
using Bit.Core.Billing.Models.Sales;
diff --git a/src/Core/Billing/Services/Implementations/SubscriberService.cs b/src/Core/Billing/Services/Implementations/SubscriberService.cs
index 796f700e9f..7a0e78a6dc 100644
--- a/src/Core/Billing/Services/Implementations/SubscriberService.cs
+++ b/src/Core/Billing/Services/Implementations/SubscriberService.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.Billing.Caches;
using Bit.Core.Billing.Constants;
diff --git a/src/Core/Billing/Tax/Models/TaxIdType.cs b/src/Core/Billing/Tax/Models/TaxIdType.cs
index 6f8cfdde99..005b1eb6a6 100644
--- a/src/Core/Billing/Tax/Models/TaxIdType.cs
+++ b/src/Core/Billing/Tax/Models/TaxIdType.cs
@@ -1,4 +1,7 @@
-using System.Text.RegularExpressions;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.RegularExpressions;
namespace Bit.Core.Billing.Tax.Models;
diff --git a/src/Core/Billing/Tax/Requests/PreviewIndividualInvoiceRequestModel.cs b/src/Core/Billing/Tax/Requests/PreviewIndividualInvoiceRequestModel.cs
index 340f07b56c..db5ba190bd 100644
--- a/src/Core/Billing/Tax/Requests/PreviewIndividualInvoiceRequestModel.cs
+++ b/src/Core/Billing/Tax/Requests/PreviewIndividualInvoiceRequestModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Core.Billing.Tax.Requests;
diff --git a/src/Core/Billing/Tax/Requests/PreviewOrganizationInvoiceRequestModel.cs b/src/Core/Billing/Tax/Requests/PreviewOrganizationInvoiceRequestModel.cs
index bfb47e7b2c..f0bc368f07 100644
--- a/src/Core/Billing/Tax/Requests/PreviewOrganizationInvoiceRequestModel.cs
+++ b/src/Core/Billing/Tax/Requests/PreviewOrganizationInvoiceRequestModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
using Bit.Core.Billing.Enums;
using Bit.Core.Enums;
diff --git a/src/Core/Billing/Tax/Requests/TaxInformationRequestModel.cs b/src/Core/Billing/Tax/Requests/TaxInformationRequestModel.cs
index 13d4870ac5..cd1046f480 100644
--- a/src/Core/Billing/Tax/Requests/TaxInformationRequestModel.cs
+++ b/src/Core/Billing/Tax/Requests/TaxInformationRequestModel.cs
@@ -1,4 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.ComponentModel.DataAnnotations;
namespace Bit.Core.Billing.Tax.Requests;
diff --git a/src/Core/Billing/Tax/Services/Implementations/TaxService.cs b/src/Core/Billing/Tax/Services/Implementations/TaxService.cs
index 204c997335..55a8ab1c50 100644
--- a/src/Core/Billing/Tax/Services/Implementations/TaxService.cs
+++ b/src/Core/Billing/Tax/Services/Implementations/TaxService.cs
@@ -1,4 +1,7 @@
-using System.Text.RegularExpressions;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Text.RegularExpressions;
using Bit.Core.Billing.Tax.Models;
namespace Bit.Core.Billing.Tax.Services.Implementations;
diff --git a/src/Core/Billing/Utilities.cs b/src/Core/Billing/Utilities.cs
index ebb7b0e525..2ee6b75664 100644
--- a/src/Core/Billing/Utilities.cs
+++ b/src/Core/Billing/Utilities.cs
@@ -1,4 +1,7 @@
-using Bit.Core.Billing.Models;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.Billing.Models;
using Bit.Core.Billing.Tax.Models;
using Bit.Core.Services;
using Stripe;
diff --git a/src/Core/Models/Api/Request/OrganizationLicenses/SelfHostedOrganizationLicenseRequestModel.cs b/src/Core/Models/Api/Request/OrganizationLicenses/SelfHostedOrganizationLicenseRequestModel.cs
index 365d88877e..a010f828de 100644
--- a/src/Core/Models/Api/Request/OrganizationLicenses/SelfHostedOrganizationLicenseRequestModel.cs
+++ b/src/Core/Models/Api/Request/OrganizationLicenses/SelfHostedOrganizationLicenseRequestModel.cs
@@ -1,4 +1,7 @@
-namespace Bit.Core.Models.Api.OrganizationLicenses;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Core.Models.Api.OrganizationLicenses;
public class SelfHostedOrganizationLicenseRequestModel
{
diff --git a/src/Core/Models/Business/OrganizationLicense.cs b/src/Core/Models/Business/OrganizationLicense.cs
index e8c04b1277..c40f5fd899 100644
--- a/src/Core/Models/Business/OrganizationLicense.cs
+++ b/src/Core/Models/Business/OrganizationLicense.cs
@@ -1,4 +1,7 @@
-using System.Reflection;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Reflection;
using System.Security.Claims;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
diff --git a/src/Core/Models/Mail/Billing/BusinessUnitConversionInviteModel.cs b/src/Core/Models/Mail/Billing/BusinessUnitConversionInviteModel.cs
index 328d37058b..ab0d2955e2 100644
--- a/src/Core/Models/Mail/Billing/BusinessUnitConversionInviteModel.cs
+++ b/src/Core/Models/Mail/Billing/BusinessUnitConversionInviteModel.cs
@@ -1,4 +1,7 @@
-namespace Bit.Core.Models.Mail.Billing;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+namespace Bit.Core.Models.Mail.Billing;
public class BusinessUnitConversionInviteModel : BaseMailModel
{
diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
index 44edde1495..99a8e68380 100644
--- a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
+++ b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Repositories;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs
index 89ea53fc20..7c78abe480 100644
--- a/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs
+++ b/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs
@@ -1,4 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using Bit.Core.AdminConsole.Entities;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Exceptions;
diff --git a/src/Infrastructure.Dapper/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs b/src/Infrastructure.Dapper/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs
index e43eb9a71f..500b76a309 100644
--- a/src/Infrastructure.Dapper/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs
+++ b/src/Infrastructure.Dapper/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs
@@ -1,4 +1,7 @@
-using System.Data;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Data;
using Bit.Core.Billing.Providers.Entities;
using Bit.Core.Billing.Providers.Repositories;
using Bit.Core.Settings;
diff --git a/src/Infrastructure.Dapper/Billing/Repositories/OrganizationInstallationRepository.cs b/src/Infrastructure.Dapper/Billing/Repositories/OrganizationInstallationRepository.cs
index f73eefb793..a3e2063312 100644
--- a/src/Infrastructure.Dapper/Billing/Repositories/OrganizationInstallationRepository.cs
+++ b/src/Infrastructure.Dapper/Billing/Repositories/OrganizationInstallationRepository.cs
@@ -1,4 +1,7 @@
-using System.Data;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using System.Data;
using Bit.Core.Billing.Entities;
using Bit.Core.Billing.Repositories;
using Bit.Core.Settings;
diff --git a/src/Infrastructure.EntityFramework/Billing/Models/OrganizationInstallation.cs b/src/Infrastructure.EntityFramework/Billing/Models/OrganizationInstallation.cs
index c59a2accba..da8ee8b1b6 100644
--- a/src/Infrastructure.EntityFramework/Billing/Models/OrganizationInstallation.cs
+++ b/src/Infrastructure.EntityFramework/Billing/Models/OrganizationInstallation.cs
@@ -1,4 +1,7 @@
-using AutoMapper;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using AutoMapper;
using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
using Bit.Infrastructure.EntityFramework.Platform;
diff --git a/src/Infrastructure.EntityFramework/Billing/Models/ProviderInvoiceItem.cs b/src/Infrastructure.EntityFramework/Billing/Models/ProviderInvoiceItem.cs
index 1bea786f21..2fdd27868e 100644
--- a/src/Infrastructure.EntityFramework/Billing/Models/ProviderInvoiceItem.cs
+++ b/src/Infrastructure.EntityFramework/Billing/Models/ProviderInvoiceItem.cs
@@ -1,4 +1,7 @@
-using AutoMapper;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using AutoMapper;
using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
namespace Bit.Infrastructure.EntityFramework.Billing.Models;
diff --git a/src/Infrastructure.EntityFramework/Billing/Models/ProviderPlan.cs b/src/Infrastructure.EntityFramework/Billing/Models/ProviderPlan.cs
index c9ba4c813e..7bdb7298e4 100644
--- a/src/Infrastructure.EntityFramework/Billing/Models/ProviderPlan.cs
+++ b/src/Infrastructure.EntityFramework/Billing/Models/ProviderPlan.cs
@@ -1,4 +1,7 @@
-using AutoMapper;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using AutoMapper;
using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
namespace Bit.Infrastructure.EntityFramework.Billing.Models;
diff --git a/src/Infrastructure.EntityFramework/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs b/src/Infrastructure.EntityFramework/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs
index 4a9a82c9dc..d6363155f0 100644
--- a/src/Infrastructure.EntityFramework/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs
+++ b/src/Infrastructure.EntityFramework/Billing/Repositories/ClientOrganizationMigrationRecordRepository.cs
@@ -1,4 +1,7 @@
-using AutoMapper;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using AutoMapper;
using Bit.Core.Billing.Providers.Entities;
using Bit.Core.Billing.Providers.Repositories;
using Bit.Infrastructure.EntityFramework.Repositories;
diff --git a/src/Infrastructure.EntityFramework/Billing/Repositories/OrganizationInstallationRepository.cs b/src/Infrastructure.EntityFramework/Billing/Repositories/OrganizationInstallationRepository.cs
index 566c52332e..9656b1073d 100644
--- a/src/Infrastructure.EntityFramework/Billing/Repositories/OrganizationInstallationRepository.cs
+++ b/src/Infrastructure.EntityFramework/Billing/Repositories/OrganizationInstallationRepository.cs
@@ -1,4 +1,7 @@
-using AutoMapper;
+// FIXME: Update this file to be null safe and then delete the line below
+#nullable disable
+
+using AutoMapper;
using Bit.Core.Billing.Entities;
using Bit.Core.Billing.Repositories;
using Bit.Infrastructure.EntityFramework.Repositories;