diff --git a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
index 219057f2d9..3f12d690b5 100644
--- a/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
+++ b/bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
@@ -75,7 +75,7 @@ namespace Bit.Core.Business.Sso
             _ssoConfigRepository = ssoConfigRepository;
             _logger = logger;
             _globalSettings = globalSettings;
-            _schemeCacheLifetime = TimeSpan.FromSeconds(_globalSettings.Sso?.CacheLifetimeInSeconds ?? 60);
+            _schemeCacheLifetime = TimeSpan.FromSeconds(_globalSettings.Sso?.CacheLifetimeInSeconds ?? 30);
             _samlEnvironment = samlEnvironment;
             _cachedSchemes = new Dictionary<string, DynamicAuthenticationScheme>();
             _cachedHandlerSchemes = new Dictionary<string, DynamicAuthenticationScheme>();
diff --git a/bitwarden_license/src/Sso/appsettings.json b/bitwarden_license/src/Sso/appsettings.json
index a9e3f521b7..9bcc8382dc 100644
--- a/bitwarden_license/src/Sso/appsettings.json
+++ b/bitwarden_license/src/Sso/appsettings.json
@@ -59,7 +59,7 @@
       "region": "SECRET"
     },
     "sso": {
-      "cacheLifetimeInSeconds": 60
+      "cacheLifetimeInSeconds": 30
     }
   }
 }
diff --git a/src/Core/Repositories/SqlServer/SsoConfigRepository.cs b/src/Core/Repositories/SqlServer/SsoConfigRepository.cs
index 50084297fc..0fe3cec258 100644
--- a/src/Core/Repositories/SqlServer/SsoConfigRepository.cs
+++ b/src/Core/Repositories/SqlServer/SsoConfigRepository.cs
@@ -57,5 +57,17 @@ namespace Bit.Core.Repositories.SqlServer
                 return results.ToList();
             }
         }
+
+        public override async Task CreateAsync(SsoConfig obj)
+        {
+            obj.CreationDate = obj.RevisionDate = DateTime.UtcNow;
+            await base.CreateAsync(obj);
+        }
+
+        public override async Task ReplaceAsync(SsoConfig obj)
+        {
+            obj.RevisionDate = DateTime.UtcNow;
+            await base.ReplaceAsync(obj);
+        }
     }
 }