diff --git a/bitwarden_license/src/Portal/Startup.cs b/bitwarden_license/src/Portal/Startup.cs
index ccd8c6fb75..3972a60943 100644
--- a/bitwarden_license/src/Portal/Startup.cs
+++ b/bitwarden_license/src/Portal/Startup.cs
@@ -46,6 +46,15 @@ namespace Bit.Portal
             services.AddScoped<ICurrentContext, CurrentContext>((serviceProvider) =>
                 serviceProvider.GetService<EnterprisePortalCurrentContext>());
 
+            // Fido2
+            services.AddFido2(options =>
+            {
+                options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
+                options.ServerName = "Bitwarden";
+                options.Origin = globalSettings.BaseServiceUri.Vault;
+                options.TimestampDriftTolerance = 300000;
+            });
+
             // Identity
             services.AddEnterprisePortalTokenIdentityServices();
             if (globalSettings.SelfHosted)
diff --git a/bitwarden_license/src/Sso/Startup.cs b/bitwarden_license/src/Sso/Startup.cs
index dfac772cc1..ccfcd92d09 100644
--- a/bitwarden_license/src/Sso/Startup.cs
+++ b/bitwarden_license/src/Sso/Startup.cs
@@ -43,6 +43,15 @@ namespace Bit.Sso
             // Context
             services.AddScoped<ICurrentContext, CurrentContext>();
 
+            // Fido2
+            services.AddFido2(options =>
+            {
+                options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
+                options.ServerName = "Bitwarden";
+                options.Origin = globalSettings.BaseServiceUri.Vault;
+                options.TimestampDriftTolerance = 300000;
+            });
+
             // Mvc
             services.AddControllersWithViews();
 
diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs
index f50c169af8..0290e9378d 100644
--- a/src/Billing/Startup.cs
+++ b/src/Billing/Startup.cs
@@ -49,6 +49,15 @@ namespace Bit.Billing
             // Context
             services.AddScoped<ICurrentContext, CurrentContext>();
 
+            // Fido2
+            services.AddFido2(options =>
+            {
+                options.ServerDomain = new Uri(globalSettings.BaseServiceUri.Vault).Host;
+                options.ServerName = "Bitwarden";
+                options.Origin = globalSettings.BaseServiceUri.Vault;
+                options.TimestampDriftTolerance = 300000;
+            });
+
             // Identity
             services.AddCustomIdentityServices(globalSettings);
             //services.AddPasswordlessIdentityServices<ReadOnlyDatabaseIdentityUserStore>(globalSettings);