diff --git a/src/Foundation/Types.hs b/src/Foundation/Types.hs
index 0cb2f2234..f76076f33 100644
--- a/src/Foundation/Types.hs
+++ b/src/Foundation/Types.hs
@@ -8,7 +8,7 @@ module Foundation.Types
   , _upsertUserSource, _upsertUserIdent
   , UpsertUserData(..)
   , _UpsertUserDataAzure, _UpsertUserDataLdap
-  , _upsertUserAzureConf, _upsertUserAzureData, _upsertUserLdapConf, _upsertUserLdapData
+  , _upsertUserAzureTenantId, _upsertUserAzureData, _upsertUserLdapHost, _upsertUserLdapData
   ) where
 
 import Import.NoFoundation
@@ -16,6 +16,7 @@ import Import.NoFoundation
 import qualified Ldap.Client as Ldap
 
 
+-- TODO: rename?
 data UpsertUserMode
   = UpsertUserLogin      { upsertUserSource :: Text } -- TODO: use type synonym?
   | UpsertUserLoginDummy { upsertUserIdent  :: UserIdent }
@@ -30,12 +31,12 @@ makePrisms ''UpsertUserMode
 
 data UpsertUserData
   = UpsertUserDataAzure
-    { upsertUserAzureConf :: AzureConf
-    , upsertUserAzureData :: [(Text, [ByteString])]  -- TODO: use type synonym?
+    { upsertUserAzureTenantId :: UUID
+    , upsertUserAzureData     :: [(Text, [ByteString])]  -- TODO: use type synonym?
     }
   | UpsertUserDataLdap
-    { upsertUserLdapConf  :: LdapConf
-    , upsertUserLdapData  :: Ldap.AttrList []
+    { upsertUserLdapHost      :: Text
+    , upsertUserLdapData      :: Ldap.AttrList []
     }
   deriving (Show)