diff --git a/src/app/messages/new-group/page.tsx b/src/app/messages/new-group/page.tsx
index db826fe4..ac32d928 100644
--- a/src/app/messages/new-group/page.tsx
+++ b/src/app/messages/new-group/page.tsx
@@ -134,10 +134,10 @@ function NewGroupContent() {
       <main className="flex-1 overflow-y-auto">
         <div className="mx-auto max-w-lg p-4">
           {/* Group Name Input */}
-          <div className="form-control mb-6">
+          <div className="mb-6">
             <label htmlFor="group-name" className="label">
-              <span className="label-text font-medium">Group Name</span>
-              <span className="label-text-alt text-base-content/80">
+              <span className="font-medium">Group Name</span>
+              <span className="text-base-content/80">
                 {groupName.length}/{GROUP_CONSTRAINTS.MAX_NAME_LENGTH}
               </span>
             </label>
@@ -145,7 +145,7 @@ function NewGroupContent() {
               id="group-name"
               type="text"
               placeholder="Enter group name (optional)"
-              className="input input-bordered min-h-12 w-full"
+              className="input min-h-12 w-full"
               value={groupName}
               onChange={(e) =>
                 setGroupName(
@@ -154,9 +154,7 @@ function NewGroupContent() {
               }
               disabled={isCreating}
             />
-            <p className="label-text-alt text-base-content/80 mt-2">
-              {autoNamePreview}
-            </p>
+            <p className="text-base-content/80 mt-2">{autoNamePreview}</p>
           </div>
 
           {/* Selected Members Section */}
@@ -251,10 +249,10 @@ function NewGroupContent() {
           )}
 
           {/* Search Input */}
-          <div className="form-control mb-4">
+          <div className="mb-4">
             <label htmlFor="member-search" className="label">
-              <span className="label-text font-medium">Add Members</span>
-              <span className="label-text-alt">
+              <span className="font-medium">Add Members</span>
+              <span>
                 {selectedMembers.length}/{GROUP_CONSTRAINTS.MAX_MEMBERS - 1}{' '}
                 selected
               </span>
@@ -265,7 +263,7 @@ function NewGroupContent() {
                 ref={searchInputRef}
                 type="text"
                 placeholder="Search your connections..."
-                className="input input-bordered min-h-12 w-full pl-10"
+                className="input min-h-12 w-full pl-10"
                 value={searchQuery}
                 onChange={handleSearchChange}
                 disabled={isCreating || isAtCapacity}
@@ -286,9 +284,7 @@ function NewGroupContent() {
               </svg>
             </div>
             {isAtCapacity && (
-              <p className="label-text-alt text-warning mt-1">
-                Maximum members reached
-              </p>
+              <p className="text-warning mt-1">Maximum members reached</p>
             )}
           </div>
 
diff --git a/src/app/messages/setup/page.tsx b/src/app/messages/setup/page.tsx
index 10164780..3c4e167f 100644
--- a/src/app/messages/setup/page.tsx
+++ b/src/app/messages/setup/page.tsx
@@ -223,9 +223,9 @@ export default function MessagingSetupPage() {
             />
 
             {/* Visible email field */}
-            <div className="form-control">
+            <div>
               <label className="label" htmlFor="setup-email">
-                <span className="label-text">Account</span>
+                <span>Account</span>
               </label>
               <input
                 id="setup-email"
@@ -233,16 +233,16 @@ export default function MessagingSetupPage() {
                 name="email"
                 value={user?.email || ''}
                 readOnly
-                className="input input-bordered bg-base-200 min-h-11 w-full"
+                className="input bg-base-200 min-h-11 w-full"
                 autoComplete="username email"
               />
             </div>
 
             {/* Password field */}
-            <div className="form-control">
+            <div>
               <label className="label" htmlFor="setup-password">
-                <span className="label-text">Messaging Password</span>
-                <span className="label-text-alt text-warning">Save this!</span>
+                <span>Messaging Password</span>
+                <span className="text-warning">Save this!</span>
               </label>
               <div className="relative">
                 <input
@@ -251,7 +251,7 @@ export default function MessagingSetupPage() {
                   type={showPassword ? 'text' : 'password'}
                   value={password}
                   onChange={(e) => setPassword(e.target.value)}
-                  className="input input-bordered min-h-11 w-full pr-12"
+                  className="input min-h-11 w-full pr-12"
                   placeholder="Create a messaging password"
                   autoComplete="new-password"
                   disabled={loading}
@@ -270,9 +270,9 @@ export default function MessagingSetupPage() {
             </div>
 
             {/* Confirm password */}
-            <div className="form-control">
+            <div>
               <label className="label" htmlFor="setup-confirm">
-                <span className="label-text">Confirm Password</span>
+                <span>Confirm Password</span>
               </label>
               <input
                 id="setup-confirm"
@@ -280,14 +280,14 @@ export default function MessagingSetupPage() {
                 type={showPassword ? 'text' : 'password'}
                 value={confirmPassword}
                 onChange={(e) => setConfirmPassword(e.target.value)}
-                className="input input-bordered min-h-11 w-full"
+                className="input min-h-11 w-full"
                 placeholder="Confirm your password"
                 autoComplete="new-password"
                 disabled={loading}
                 required
               />
               <label className="label">
-                <span className="label-text-alt text-warning">
+                <span className="text-warning">
                   Your password manager should prompt to save this password
                 </span>
               </label>
diff --git a/src/components/atomic/Card/Card.test.tsx b/src/components/atomic/Card/Card.test.tsx
index b219d74f..9288b66d 100644
--- a/src/components/atomic/Card/Card.test.tsx
+++ b/src/components/atomic/Card/Card.test.tsx
@@ -48,7 +48,7 @@ describe('Card', () => {
 
   it('applies compact class when compact prop is true', () => {
     const { container } = render(<Card compact>Content</Card>);
-    expect(container.firstChild).toHaveClass('card-compact');
+    expect(container.firstChild).toHaveClass('card-sm');
   });
 
   it('applies side class when side prop is true (mobile-first: md:card-side)', () => {
@@ -63,7 +63,7 @@ describe('Card', () => {
 
   it('applies bordered class when bordered prop is true', () => {
     const { container } = render(<Card bordered>Content</Card>);
-    expect(container.firstChild).toHaveClass('card-bordered');
+    expect(container.firstChild).toHaveClass('card-border');
   });
 
   it('applies custom className', () => {
@@ -81,9 +81,9 @@ describe('Card', () => {
     const card = container.firstChild;
     expect(card).toHaveClass('card');
     expect(card).toHaveClass('bg-base-100');
-    expect(card).toHaveClass('card-compact');
+    expect(card).toHaveClass('card-sm');
     expect(card).toHaveClass('glass');
-    expect(card).toHaveClass('card-bordered');
+    expect(card).toHaveClass('card-border');
     expect(card).toHaveClass('custom');
   });
 
diff --git a/src/components/atomic/Card/Card.tsx b/src/components/atomic/Card/Card.tsx
index 78586811..8cd105ff 100644
--- a/src/components/atomic/Card/Card.tsx
+++ b/src/components/atomic/Card/Card.tsx
@@ -37,10 +37,10 @@ export const Card: React.FC<CardProps> = ({
   // side layout only on tablet+ (stacks on mobile)
   const classes = [
     baseClasses,
-    compact && 'card-compact',
+    compact && 'card-sm',
     side && 'md:card-side',
     glass && 'glass',
-    bordered && 'card-bordered',
+    bordered && 'card-border',
     className,
   ]
     .filter(Boolean)
diff --git a/src/components/atomic/MessageBubble/MessageBubble.tsx b/src/components/atomic/MessageBubble/MessageBubble.tsx
index 26cda2b3..12eae48b 100644
--- a/src/components/atomic/MessageBubble/MessageBubble.tsx
+++ b/src/components/atomic/MessageBubble/MessageBubble.tsx
@@ -283,7 +283,7 @@ const MessageBubble = memo(
                 ref={textareaRef}
                 value={editContent}
                 onChange={(e) => setEditContent(e.target.value)}
-                className="textarea textarea-bordered min-h-11 w-full resize-none"
+                className="textarea min-h-11 w-full resize-none"
                 disabled={isSubmitting}
                 aria-label="Edit message content"
                 maxLength={10000}
diff --git a/src/components/atomic/TagFilter/TagFilter.tsx b/src/components/atomic/TagFilter/TagFilter.tsx
index ab995a6e..dd3680bb 100644
--- a/src/components/atomic/TagFilter/TagFilter.tsx
+++ b/src/components/atomic/TagFilter/TagFilter.tsx
@@ -91,13 +91,13 @@ export default function TagFilter({
     <div className={`space-y-3 ${className}`} data-testid="tag-filter">
       {/* Search Input */}
       {showSearch && (
-        <div className="form-control">
+        <div>
           <input
             type="text"
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
             placeholder={searchPlaceholder}
-            className="input input-bordered input-sm w-full"
+            className="input input-sm w-full"
             aria-label="Search tags"
           />
         </div>
diff --git a/src/components/auth/AccountSettings/AccountSettings.tsx b/src/components/auth/AccountSettings/AccountSettings.tsx
index 317c5c61..5d6f86a6 100644
--- a/src/components/auth/AccountSettings/AccountSettings.tsx
+++ b/src/components/auth/AccountSettings/AccountSettings.tsx
@@ -248,42 +248,40 @@ export default function AccountSettings({
           <h3 className="card-title">Profile Settings</h3>
 
           {/* Display Name Field */}
-          <div className="form-control">
+          <div>
             <label htmlFor="displayname-input" className="label">
-              <span className="label-text">Display Name</span>
+              <span>Display Name</span>
             </label>
             <input
               id="displayname-input"
               type="text"
               value={displayName}
               onChange={(e) => setDisplayName(e.target.value)}
-              className="input input-bordered min-h-11"
+              className="input min-h-11"
               placeholder="e.g., John Doe"
               disabled={loading || isUpdatingProfile}
             />
             <label className="label">
-              <span className="label-text-alt">
-                Your friendly name shown to other users
-              </span>
+              <span>Your friendly name shown to other users</span>
             </label>
           </div>
 
           {/* Bio Field */}
-          <div className="form-control">
+          <div>
             <label htmlFor="bio-textarea" className="label">
-              <span className="label-text">Bio</span>
+              <span>Bio</span>
             </label>
             <textarea
               id="bio-textarea"
               value={bio}
               onChange={(e) => setBio(e.target.value)}
-              className="textarea textarea-bordered"
+              className="textarea"
               rows={3}
               placeholder="Tell us about yourself..."
               disabled={loading || isUpdatingProfile}
             />
             <label className="label">
-              <span className="label-text-alt">Maximum 500 characters</span>
+              <span>Maximum 500 characters</span>
             </label>
           </div>
 
@@ -370,29 +368,29 @@ export default function AccountSettings({
       <form onSubmit={handleChangePassword} className="card bg-base-200">
         <div className="card-body">
           <h3 className="card-title">Change Password</h3>
-          <div className="form-control">
+          <div>
             <label htmlFor="new-password-input" className="label">
-              <span className="label-text">New Password</span>
+              <span>New Password</span>
             </label>
             <input
               id="new-password-input"
               type="password"
               value={password}
               onChange={(e) => setPassword(e.target.value)}
-              className="input input-bordered min-h-11"
+              className="input min-h-11"
               disabled={loading || isUpdatingProfile}
             />
           </div>
-          <div className="form-control">
+          <div>
             <label htmlFor="confirm-password-input" className="label">
-              <span className="label-text">Confirm Password</span>
+              <span>Confirm Password</span>
             </label>
             <input
               id="confirm-password-input"
               type="password"
               value={confirmPassword}
               onChange={(e) => setConfirmPassword(e.target.value)}
-              className="input input-bordered min-h-11"
+              className="input min-h-11"
               disabled={loading || isUpdatingProfile}
             />
           </div>
diff --git a/src/components/auth/ForgotPasswordForm/ForgotPasswordForm.tsx b/src/components/auth/ForgotPasswordForm/ForgotPasswordForm.tsx
index bbdadc7f..267c4c9b 100644
--- a/src/components/auth/ForgotPasswordForm/ForgotPasswordForm.tsx
+++ b/src/components/auth/ForgotPasswordForm/ForgotPasswordForm.tsx
@@ -107,16 +107,16 @@ export default function ForgotPasswordForm({
       onSubmit={handleSubmit}
       className={`space-y-4${className ? ` ${className}` : ''}`}
     >
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="email">
-          <span className="label-text">Email</span>
+          <span>Email</span>
         </label>
         <input
           id="email"
           type="email"
           value={email}
           onChange={(e) => setEmail(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="you@example.com"
           required
           disabled={loading}
diff --git a/src/components/auth/ReAuthModal/ReAuthModal.tsx b/src/components/auth/ReAuthModal/ReAuthModal.tsx
index b7631b53..515c622c 100644
--- a/src/components/auth/ReAuthModal/ReAuthModal.tsx
+++ b/src/components/auth/ReAuthModal/ReAuthModal.tsx
@@ -329,9 +329,9 @@ export function ReAuthModal({
             />
 
             {/* Email field for password manager compatibility - shown for all users */}
-            <div className="form-control mb-4">
+            <div className="mb-4">
               <label className="label" htmlFor="reauth-email">
-                <span className="label-text">Account</span>
+                <span>Account</span>
               </label>
               <input
                 id="reauth-email"
@@ -339,14 +339,14 @@ export function ReAuthModal({
                 name="email"
                 value={user?.email || ''}
                 readOnly
-                className="input input-bordered bg-base-200 min-h-11 w-full"
+                className="input bg-base-200 min-h-11 w-full"
                 autoComplete="username"
               />
             </div>
 
-            <div className="form-control">
+            <div>
               <label className="label" htmlFor="reauth-password">
-                <span className="label-text">
+                <span>
                   {mode === 'setup' || oauthUser
                     ? 'Messaging Password'
                     : 'Password'}
@@ -360,7 +360,7 @@ export function ReAuthModal({
                   type={showPassword ? 'text' : 'password'}
                   value={password}
                   onChange={(e) => setPassword(e.target.value)}
-                  className="input input-bordered min-h-11 w-full pr-12"
+                  className="input min-h-11 w-full pr-12"
                   placeholder={
                     mode === 'setup'
                       ? 'Create a messaging password'
@@ -424,9 +424,9 @@ export function ReAuthModal({
                 setup is the primary path for OAuth users from /messages
                 (FR-021, Feature 013). */}
             {mode === 'setup' && (
-              <div className="form-control mt-4">
+              <div className="mt-4">
                 <label className="label" htmlFor="reauth-confirm-password">
-                  <span className="label-text">Confirm Password</span>
+                  <span>Confirm Password</span>
                 </label>
                 <input
                   id="reauth-confirm-password"
@@ -434,7 +434,7 @@ export function ReAuthModal({
                   type={showPassword ? 'text' : 'password'}
                   value={confirmPassword}
                   onChange={(e) => setConfirmPassword(e.target.value)}
-                  className="input input-bordered min-h-11 w-full"
+                  className="input min-h-11 w-full"
                   placeholder="Confirm your password"
                   autoComplete="new-password"
                   disabled={loading}
diff --git a/src/components/auth/ResetPasswordForm/ResetPasswordForm.tsx b/src/components/auth/ResetPasswordForm/ResetPasswordForm.tsx
index cd66dcea..1d80d172 100644
--- a/src/components/auth/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/src/components/auth/ResetPasswordForm/ResetPasswordForm.tsx
@@ -62,32 +62,32 @@ export default function ResetPasswordForm({
       onSubmit={handleSubmit}
       className={`space-y-4${className ? ` ${className}` : ''}`}
     >
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="password">
-          <span className="label-text">New Password</span>
+          <span>New Password</span>
         </label>
         <input
           id="password"
           type="password"
           value={password}
           onChange={(e) => setPassword(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="••••••••"
           required
           disabled={loading}
         />
       </div>
 
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="confirm-password">
-          <span className="label-text">Confirm Password</span>
+          <span>Confirm Password</span>
         </label>
         <input
           id="confirm-password"
           type="password"
           value={confirmPassword}
           onChange={(e) => setConfirmPassword(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="••••••••"
           required
           disabled={loading}
diff --git a/src/components/auth/SignInForm/SignInForm.tsx b/src/components/auth/SignInForm/SignInForm.tsx
index 75337318..f5a39999 100644
--- a/src/components/auth/SignInForm/SignInForm.tsx
+++ b/src/components/auth/SignInForm/SignInForm.tsx
@@ -252,16 +252,16 @@ export default function SignInForm({
       onSubmit={handleSubmit}
       className={`space-y-4${className ? ` ${className}` : ''}`}
     >
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="email">
-          <span className="label-text">Email</span>
+          <span>Email</span>
         </label>
         <input
           id="email"
           type="email"
           value={email}
           onChange={(e) => setEmail(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="you@example.com"
           autoComplete="email"
           required
@@ -269,16 +269,16 @@ export default function SignInForm({
         />
       </div>
 
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="password">
-          <span className="label-text">Password</span>
+          <span>Password</span>
         </label>
         <input
           id="password"
           type="password"
           value={password}
           onChange={(e) => setPassword(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="••••••••"
           autoComplete="current-password"
           required
@@ -286,7 +286,7 @@ export default function SignInForm({
         />
       </div>
 
-      <div className="form-control">
+      <div>
         <label
           htmlFor="remember-me"
           className="label cursor-pointer justify-start gap-3"
@@ -300,7 +300,7 @@ export default function SignInForm({
             disabled={loading}
             aria-label="Remember Me"
           />
-          <span className="label-text">Remember Me</span>
+          <span>Remember Me</span>
         </label>
       </div>
 
diff --git a/src/components/auth/SignUpForm/SignUpForm.tsx b/src/components/auth/SignUpForm/SignUpForm.tsx
index fd6c2fb3..9bc2743d 100644
--- a/src/components/auth/SignUpForm/SignUpForm.tsx
+++ b/src/components/auth/SignUpForm/SignUpForm.tsx
@@ -164,32 +164,32 @@ export default function SignUpForm({
       onSubmit={handleSubmit}
       className={`space-y-4${className ? ` ${className}` : ''}`}
     >
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="email">
-          <span className="label-text">Email</span>
+          <span>Email</span>
         </label>
         <input
           id="email"
           type="email"
           value={email}
           onChange={(e) => setEmail(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="you@example.com"
           required
           disabled={loading}
         />
       </div>
 
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="password">
-          <span className="label-text">Password</span>
+          <span>Password</span>
         </label>
         <input
           id="password"
           type="password"
           value={password}
           onChange={(e) => setPassword(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="••••••••"
           required
           disabled={loading}
@@ -200,23 +200,23 @@ export default function SignUpForm({
         </div>
       </div>
 
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="confirm-password">
-          <span className="label-text">Confirm Password</span>
+          <span>Confirm Password</span>
         </label>
         <input
           id="confirm-password"
           type="password"
           value={confirmPassword}
           onChange={(e) => setConfirmPassword(e.target.value)}
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           placeholder="••••••••"
           required
           disabled={loading}
         />
       </div>
 
-      <div className="form-control">
+      <div>
         <label className="label cursor-pointer justify-start gap-2">
           <input
             type="checkbox"
@@ -225,7 +225,7 @@ export default function SignUpForm({
             className="checkbox min-h-11 min-w-11"
             disabled={loading}
           />
-          <span className="label-text">Remember me</span>
+          <span>Remember me</span>
         </label>
       </div>
 
diff --git a/src/components/forms/ContactForm/ContactForm.tsx b/src/components/forms/ContactForm/ContactForm.tsx
index 6e018f14..9a6c20b8 100644
--- a/src/components/forms/ContactForm/ContactForm.tsx
+++ b/src/components/forms/ContactForm/ContactForm.tsx
@@ -202,17 +202,17 @@ export const ContactForm: React.FC<ContactFormProps> = ({
         )}
 
         {/* Name Field */}
-        <div className="form-control">
+        <div>
           <label htmlFor="name" className="label">
-            <span className="label-text">Full Name</span>
-            <span className="label-text-alt text-error">*</span>
+            <span>Full Name</span>
+            <span className="text-error">*</span>
           </label>
           <input
             {...register('name')}
             id="name"
             type="text"
             placeholder="John Doe"
-            className={`input input-bordered ${errors.name ? 'input-error' : ''}`}
+            className={`input ${errors.name ? 'input-error' : ''}`}
             aria-required="true"
             aria-invalid={!!errors.name}
             aria-describedby={errors.name ? 'name-error' : undefined}
@@ -222,11 +222,7 @@ export const ContactForm: React.FC<ContactFormProps> = ({
           />
           {errors.name && (
             <label className="label" id="name-error">
-              <span
-                className="label-text-alt text-error"
-                role="alert"
-                aria-live="polite"
-              >
+              <span className="text-error" role="alert" aria-live="polite">
                 {errors.name.message}
               </span>
             </label>
@@ -234,17 +230,17 @@ export const ContactForm: React.FC<ContactFormProps> = ({
         </div>
 
         {/* Email Field */}
-        <div className="form-control">
+        <div>
           <label htmlFor="email" className="label">
-            <span className="label-text">Email Address</span>
-            <span className="label-text-alt text-error">*</span>
+            <span>Email Address</span>
+            <span className="text-error">*</span>
           </label>
           <input
             {...register('email')}
             id="email"
             type="email"
             placeholder="john@example.com"
-            className={`input input-bordered ${errors.email ? 'input-error' : ''}`}
+            className={`input ${errors.email ? 'input-error' : ''}`}
             aria-required="true"
             aria-invalid={!!errors.email}
             aria-describedby={errors.email ? 'email-error' : undefined}
@@ -254,11 +250,7 @@ export const ContactForm: React.FC<ContactFormProps> = ({
           />
           {errors.email && (
             <label className="label" id="email-error">
-              <span
-                className="label-text-alt text-error"
-                role="alert"
-                aria-live="polite"
-              >
+              <span className="text-error" role="alert" aria-live="polite">
                 {errors.email.message}
               </span>
             </label>
@@ -266,17 +258,17 @@ export const ContactForm: React.FC<ContactFormProps> = ({
         </div>
 
         {/* Subject Field */}
-        <div className="form-control">
+        <div>
           <label htmlFor="subject" className="label">
-            <span className="label-text">Subject</span>
-            <span className="label-text-alt text-error">*</span>
+            <span>Subject</span>
+            <span className="text-error">*</span>
           </label>
           <input
             {...register('subject')}
             id="subject"
             type="text"
             placeholder="How can we help you?"
-            className={`input input-bordered ${errors.subject ? 'input-error' : ''}`}
+            className={`input ${errors.subject ? 'input-error' : ''}`}
             aria-required="true"
             aria-invalid={!!errors.subject}
             aria-describedby={errors.subject ? 'subject-error' : undefined}
@@ -285,11 +277,7 @@ export const ContactForm: React.FC<ContactFormProps> = ({
           />
           {errors.subject && (
             <label className="label" id="subject-error">
-              <span
-                className="label-text-alt text-error"
-                role="alert"
-                aria-live="polite"
-              >
+              <span className="text-error" role="alert" aria-live="polite">
                 {errors.subject.message}
               </span>
             </label>
@@ -297,17 +285,17 @@ export const ContactForm: React.FC<ContactFormProps> = ({
         </div>
 
         {/* Message Field */}
-        <div className="form-control">
+        <div>
           <label htmlFor="message" className="label">
-            <span className="label-text">Message</span>
-            <span className="label-text-alt text-error">*</span>
+            <span>Message</span>
+            <span className="text-error">*</span>
           </label>
           <textarea
             {...register('message')}
             id="message"
             rows={6}
             placeholder="Tell us more about your inquiry..."
-            className={`textarea textarea-bordered ${errors.message ? 'textarea-error' : ''}`}
+            className={`textarea ${errors.message ? 'textarea-error' : ''}`}
             aria-required="true"
             aria-invalid={!!errors.message}
             aria-describedby={errors.message ? 'message-error' : undefined}
@@ -316,11 +304,7 @@ export const ContactForm: React.FC<ContactFormProps> = ({
           />
           {errors.message && (
             <label className="label" id="message-error">
-              <span
-                className="label-text-alt text-error"
-                role="alert"
-                aria-live="polite"
-              >
+              <span className="text-error" role="alert" aria-live="polite">
                 {errors.message.message}
               </span>
             </label>
@@ -350,7 +334,7 @@ export const ContactForm: React.FC<ContactFormProps> = ({
         )}
 
         {/* Submit Button */}
-        <div className="form-control mt-6">
+        <div className="mt-6">
           <button
             type="submit"
             className={`btn btn-primary ${isSubmitting ? 'loading' : ''} ${!isOnline ? 'btn-warning' : ''}`}
diff --git a/src/components/forms/FormField.tsx b/src/components/forms/FormField.tsx
index d3b5373c..b54ddb58 100644
--- a/src/components/forms/FormField.tsx
+++ b/src/components/forms/FormField.tsx
@@ -65,9 +65,9 @@ export const FormField: React.FC<FormFieldProps> = ({
   const helpId = `${name}-help`;
 
   return (
-    <div className={`form-control ${className}`}>
+    <div className={`${className}`}>
       <label htmlFor={name} className={`label ${hideLabel ? 'sr-only' : ''}`}>
-        <span className="label-text">
+        <span>
           {label}
           {required && (
             <span className="text-error ml-1" aria-label="required">
@@ -82,7 +82,7 @@ export const FormField: React.FC<FormFieldProps> = ({
 
       {/* Help text */}
       {helpText && !error && (
-        <div id={helpId} className="label-text-alt text-base-content/85 mt-1">
+        <div id={helpId} className="text-base-content/85 mt-1">
           {helpText}
         </div>
       )}
diff --git a/src/components/forms/ValidatedInput.tsx b/src/components/forms/ValidatedInput.tsx
index 5274764d..efc37999 100644
--- a/src/components/forms/ValidatedInput.tsx
+++ b/src/components/forms/ValidatedInput.tsx
@@ -162,7 +162,7 @@ export const ValidatedInput = forwardRef<HTMLInputElement, ValidatedInputProps>(
 
     // Build className
     const inputClassName = `
-      input input-bordered
+      input
       ${sizeClasses[size]}
       ${stateClasses}
       ${loading || isValidating ? 'opacity-75' : ''}
diff --git a/src/components/map/GeolocationConsent/GeolocationConsent.tsx b/src/components/map/GeolocationConsent/GeolocationConsent.tsx
index 0b71c2f2..b92d367f 100644
--- a/src/components/map/GeolocationConsent/GeolocationConsent.tsx
+++ b/src/components/map/GeolocationConsent/GeolocationConsent.tsx
@@ -105,16 +105,16 @@ export const GeolocationConsent: React.FC<GeolocationConsentProps> = ({
           {description}
         </p>
 
-        <div className="form-control">
+        <div>
           <label className="label">
-            <span className="label-text font-semibold">
+            <span className="font-semibold">
               We would like to use your location to:
             </span>
           </label>
 
           {purposes.map((purpose) => (
             <label key={purpose} className="label cursor-pointer">
-              <span className="label-text">{purposeLabels[purpose]}</span>
+              <span>{purposeLabels[purpose]}</span>
               <input
                 type="checkbox"
                 className="checkbox checkbox-primary"
diff --git a/src/components/molecular/AccountDeletionModal/AccountDeletionModal.tsx b/src/components/molecular/AccountDeletionModal/AccountDeletionModal.tsx
index de28240c..e0a29ccd 100644
--- a/src/components/molecular/AccountDeletionModal/AccountDeletionModal.tsx
+++ b/src/components/molecular/AccountDeletionModal/AccountDeletionModal.tsx
@@ -125,9 +125,9 @@ export default function AccountDeletionModal({
             <li>All encryption keys</li>
           </ul>
 
-          <div className="form-control">
+          <div>
             <label htmlFor="confirmation-input" className="label">
-              <span className="label-text font-semibold">
+              <span className="font-semibold">
                 Type <span className="text-error font-mono">DELETE</span> to
                 confirm:
               </span>
@@ -138,7 +138,7 @@ export default function AccountDeletionModal({
               value={confirmationText}
               onChange={(e) => setConfirmationText(e.target.value)}
               disabled={isDeleting}
-              className="input input-bordered min-h-11"
+              className="input min-h-11"
               placeholder="DELETE"
               autoComplete="off"
               aria-required="true"
@@ -151,7 +151,7 @@ export default function AccountDeletionModal({
             />
             {confirmationText.length > 0 && !isConfirmed && (
               <label id="confirmation-error" className="label">
-                <span className="label-text-alt text-error">
+                <span className="text-error">
                   Please type DELETE exactly (case-sensitive)
                 </span>
               </label>
diff --git a/src/components/molecular/ColorblindToggle/ColorblindToggle.tsx b/src/components/molecular/ColorblindToggle/ColorblindToggle.tsx
index e3e9a1a1..93f4a63d 100644
--- a/src/components/molecular/ColorblindToggle/ColorblindToggle.tsx
+++ b/src/components/molecular/ColorblindToggle/ColorblindToggle.tsx
@@ -117,17 +117,17 @@ export const ColorblindToggle: React.FC<ColorblindToggleProps> = ({
 
       <div
         tabIndex={0}
-        className="dropdown-content card card-compact bg-base-100 z-50 w-64 max-w-[calc(100vw-2rem)] p-4 shadow sm:w-80"
+        className="dropdown-content card card-sm bg-base-100 z-50 w-64 max-w-[calc(100vw-2rem)] p-4 shadow sm:w-80"
       >
         <div className="card-body">
           <h3 className="text-lg font-bold">Color Vision Assistance</h3>
 
-          <div className="form-control">
+          <div>
             <label className="label">
-              <span className="label-text">Assistance Mode</span>
+              <span>Assistance Mode</span>
             </label>
             <select
-              className="select select-bordered w-full"
+              className="select w-full"
               value={mode}
               onChange={handleModeChange}
               aria-label="Select assistance mode"
@@ -141,9 +141,9 @@ export const ColorblindToggle: React.FC<ColorblindToggleProps> = ({
           </div>
 
           {mode !== ColorblindType.NONE && (
-            <div className="form-control mt-4">
+            <div className="mt-4">
               <label className="label cursor-pointer">
-                <span className="label-text">Enable Patterns</span>
+                <span>Enable Patterns</span>
                 <input
                   type="checkbox"
                   className="toggle toggle-primary"
@@ -152,9 +152,7 @@ export const ColorblindToggle: React.FC<ColorblindToggleProps> = ({
                   aria-label="Toggle pattern overlays"
                 />
               </label>
-              <span className="label-text-alt">
-                Adds patterns to help distinguish colors
-              </span>
+              <span>Adds patterns to help distinguish colors</span>
             </div>
           )}
 
diff --git a/src/components/molecular/DateRangeFilter/DateRangeFilter.tsx b/src/components/molecular/DateRangeFilter/DateRangeFilter.tsx
index f34cf95d..8e6fecdd 100644
--- a/src/components/molecular/DateRangeFilter/DateRangeFilter.tsx
+++ b/src/components/molecular/DateRangeFilter/DateRangeFilter.tsx
@@ -58,28 +58,28 @@ export default function DateRangeFilter({
       className={`flex flex-wrap items-end gap-4${className ? ` ${className}` : ''}`}
       data-testid={testId}
     >
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="date-range-start">
-          <span className="label-text">Start date</span>
+          <span>Start date</span>
         </label>
         <input
           id="date-range-start"
           type="date"
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           value={start}
           max={end || undefined}
           onChange={(e) => onChange({ start: e.target.value, end })}
         />
       </div>
 
-      <div className="form-control">
+      <div>
         <label className="label" htmlFor="date-range-end">
-          <span className="label-text">End date</span>
+          <span>End date</span>
         </label>
         <input
           id="date-range-end"
           type="date"
-          className="input input-bordered min-h-11"
+          className="input min-h-11"
           value={end}
           min={start || undefined}
           onChange={(e) => onChange({ start, end: e.target.value })}
diff --git a/src/components/molecular/DateRangePicker/DateRangePicker.tsx b/src/components/molecular/DateRangePicker/DateRangePicker.tsx
index 1718348c..3c48eb72 100644
--- a/src/components/molecular/DateRangePicker/DateRangePicker.tsx
+++ b/src/components/molecular/DateRangePicker/DateRangePicker.tsx
@@ -73,12 +73,12 @@ export function DateRangePicker({
       className={`flex flex-wrap items-end gap-3${className ? ` ${className}` : ''}`}
       data-testid={testId}
     >
-      <label className="form-control">
-        <span className="label-text mb-1 text-xs">From</span>
+      <label>
+        <span className="mb-1 text-xs">From</span>
         <input
           type="date"
           aria-label="From date"
-          className="input input-bordered input-sm min-h-11"
+          className="input input-sm min-h-11"
           value={toDateInputValue(value.from)}
           onChange={(e) =>
             onChange({ ...value, from: fromDateInputValue(e.target.value) })
@@ -86,12 +86,12 @@ export function DateRangePicker({
         />
       </label>
 
-      <label className="form-control">
-        <span className="label-text mb-1 text-xs">To</span>
+      <label>
+        <span className="mb-1 text-xs">To</span>
         <input
           type="date"
           aria-label="To date"
-          className="input input-bordered input-sm min-h-11"
+          className="input input-sm min-h-11"
           value={toDateInputValue(value.to)}
           onChange={(e) =>
             onChange({ ...value, to: fromDateInputValue(e.target.value) })
diff --git a/src/components/molecular/FontSwitcher/FontSwitcher.tsx b/src/components/molecular/FontSwitcher/FontSwitcher.tsx
index 195b3676..4c3fe345 100644
--- a/src/components/molecular/FontSwitcher/FontSwitcher.tsx
+++ b/src/components/molecular/FontSwitcher/FontSwitcher.tsx
@@ -77,7 +77,7 @@ export const FontSwitcher: React.FC<FontSwitcherProps> = ({
       </button>
       <div
         tabIndex={0}
-        className="dropdown-content menu card card-compact bg-base-100 z-[100] mt-2 w-80 p-4 shadow-xl"
+        className="dropdown-content menu card card-sm bg-base-100 z-[100] mt-2 w-80 p-4 shadow-xl"
       >
         <div className="card-body">
           <h3 className="mb-2 text-lg font-bold">Font Selection</h3>
diff --git a/src/components/molecular/MessageInput/MessageInput.tsx b/src/components/molecular/MessageInput/MessageInput.tsx
index bb621245..8ce9a819 100644
--- a/src/components/molecular/MessageInput/MessageInput.tsx
+++ b/src/components/molecular/MessageInput/MessageInput.tsx
@@ -158,7 +158,7 @@ export default function MessageInput({
             onKeyDown={handleKeyDown}
             placeholder={placeholder}
             disabled={disabled || sending}
-            className="textarea textarea-bordered w-full resize-none"
+            className="textarea w-full resize-none"
             rows={1}
             aria-label="Message input"
             aria-describedby="char-count"
diff --git a/src/components/molecular/UserSearch/UserSearch.tsx b/src/components/molecular/UserSearch/UserSearch.tsx
index 7f71f1b0..8bef3de5 100644
--- a/src/components/molecular/UserSearch/UserSearch.tsx
+++ b/src/components/molecular/UserSearch/UserSearch.tsx
@@ -95,9 +95,9 @@ export default function UserSearch({
       data-testid="user-search"
     >
       <form onSubmit={handleSearch} className="mb-6">
-        <div className="form-control">
+        <div>
           <label htmlFor="user-search-input" className="label">
-            <span className="label-text">Search for users by name</span>
+            <span>Search for users by name</span>
           </label>
           <div className="flex flex-col gap-2 sm:flex-row sm:gap-3">
             <input
@@ -106,7 +106,7 @@ export default function UserSearch({
               value={query}
               onChange={(e) => setQuery(e.target.value)}
               placeholder="Enter name"
-              className="input input-bordered min-h-11 flex-1"
+              className="input min-h-11 flex-1"
               aria-label="Search for users"
               disabled={loading}
             />
diff --git a/src/components/organisms/A11yDevOverlay/A11yDevOverlay.tsx b/src/components/organisms/A11yDevOverlay/A11yDevOverlay.tsx
index 09b9ab02..271eb700 100644
--- a/src/components/organisms/A11yDevOverlay/A11yDevOverlay.tsx
+++ b/src/components/organisms/A11yDevOverlay/A11yDevOverlay.tsx
@@ -241,7 +241,7 @@ export default function A11yDevOverlay({
           onChange={(e) => setSearch(e.target.value)}
           placeholder="Search by rule id…"
           aria-label="Search violations by rule id"
-          className="input input-bordered input-xs w-full"
+          className="input input-xs w-full"
         />
       </div>
 
diff --git a/src/components/organisms/AdminAuditTrail/AdminAuditTrail.tsx b/src/components/organisms/AdminAuditTrail/AdminAuditTrail.tsx
index 66bce3ff..c9562c84 100644
--- a/src/components/organisms/AdminAuditTrail/AdminAuditTrail.tsx
+++ b/src/components/organisms/AdminAuditTrail/AdminAuditTrail.tsx
@@ -335,10 +335,7 @@ export function AdminAuditTrail({
               })}
             </div>
           ) : (
-            <p
-              className="text-base-content text-sm"
-              data-testid="burst-empty"
-            >
+            <p className="text-base-content text-sm" data-testid="burst-empty">
               No bursts detected in this range.
             </p>
           )}
@@ -360,7 +357,7 @@ export function AdminAuditTrail({
             </label>
             <select
               id="event-type-filter"
-              className="select select-bordered select-sm"
+              className="select select-sm"
               value={eventTypeFilter}
               onChange={(e) => onEventTypeChange(e.target.value)}
               data-testid="event-type-filter"
diff --git a/src/components/organisms/AdminUserManagement/AdminUserManagement.tsx b/src/components/organisms/AdminUserManagement/AdminUserManagement.tsx
index 5eef92d1..f733dbd8 100644
--- a/src/components/organisms/AdminUserManagement/AdminUserManagement.tsx
+++ b/src/components/organisms/AdminUserManagement/AdminUserManagement.tsx
@@ -182,10 +182,7 @@ export function AdminUserManagement({
               User List
             </h2>
             {total !== undefined && (
-              <p
-                className="text-base-content text-sm"
-                data-testid="user-count"
-              >
+              <p className="text-base-content text-sm" data-testid="user-count">
                 {onPageChange
                   ? `Showing ${total === 0 ? 0 : currentPage * pageSize + 1}\u2013${Math.min((currentPage + 1) * pageSize, total)} of ${total}`
                   : `Showing ${users.length} of ${total}`}
@@ -199,7 +196,7 @@ export function AdminUserManagement({
               onChange={(e) => onSearchChange(e.target.value)}
               placeholder="Search username or display name"
               aria-label="Search users"
-              className="input input-bordered input-sm w-full max-w-xs"
+              className="input input-sm w-full max-w-xs"
               data-testid="user-search"
             />
           )}
diff --git a/src/components/organisms/CaptainShipCrewWithNPC/CaptainShipCrewWithNPC.tsx b/src/components/organisms/CaptainShipCrewWithNPC/CaptainShipCrewWithNPC.tsx
index 4cda5aa4..20ea5f83 100644
--- a/src/components/organisms/CaptainShipCrewWithNPC/CaptainShipCrewWithNPC.tsx
+++ b/src/components/organisms/CaptainShipCrewWithNPC/CaptainShipCrewWithNPC.tsx
@@ -617,7 +617,7 @@ export default function CaptainShipCrewWithNPC({
                   }}
                   schema={playerNameSchema}
                   error={validationErrors[index]}
-                  className="input-bordered input-sm w-full sm:flex-1"
+                  className="input-sm w-full sm:flex-1"
                   placeholder="Player name"
                   size="sm"
                   validateOnChange
@@ -634,7 +634,7 @@ export default function CaptainShipCrewWithNPC({
                         e.target.value === 'npc' ? 'medium' : undefined,
                     })
                   }
-                  className="select select-bordered select-sm w-full sm:w-auto"
+                  className="select select-sm w-full sm:w-auto"
                 >
                   <option value="human">👤 Human</option>
                   <option value="npc">🤖 NPC</option>
@@ -648,7 +648,7 @@ export default function CaptainShipCrewWithNPC({
                         difficulty: e.target.value as NPCDifficulty,
                       })
                     }
-                    className="select select-bordered select-sm w-full sm:w-auto"
+                    className="select select-sm w-full sm:w-auto"
                   >
                     <option value="easy">Easy</option>
                     <option value="medium">Medium</option>
diff --git a/src/components/organisms/ConversationList/ConversationList.tsx b/src/components/organisms/ConversationList/ConversationList.tsx
index f564e026..a6be8770 100644
--- a/src/components/organisms/ConversationList/ConversationList.tsx
+++ b/src/components/organisms/ConversationList/ConversationList.tsx
@@ -125,13 +125,13 @@ export default function ConversationList({
         <h1 className="mb-4 text-2xl font-bold">Messages</h1>
 
         {/* Search */}
-        <div className="form-control">
+        <div>
           <div className="input-group">
             <input
               ref={searchInputRef}
               type="text"
               placeholder="Search conversations..."
-              className="input input-bordered min-h-11 w-full"
+              className="input min-h-11 w-full"
               value={searchInput}
               onChange={(e) => handleSearchChange(e.target.value)}
               aria-label="Search conversations"
@@ -188,12 +188,12 @@ export default function ConversationList({
         </div>
 
         {/* Sort dropdown */}
-        <div className="form-control mt-3">
+        <div className="mt-3">
           <label className="label">
-            <span className="label-text">Sort by</span>
+            <span>Sort by</span>
           </label>
           <select
-            className="select select-bordered min-h-11 w-full"
+            className="select min-h-11 w-full"
             value={sortType}
             onChange={(e) => setSortType(e.target.value as SortType)}
             aria-label="Sort conversations"
diff --git a/src/components/organisms/CreateGroupModal/CreateGroupModal.tsx b/src/components/organisms/CreateGroupModal/CreateGroupModal.tsx
index db340e1d..001ce868 100644
--- a/src/components/organisms/CreateGroupModal/CreateGroupModal.tsx
+++ b/src/components/organisms/CreateGroupModal/CreateGroupModal.tsx
@@ -139,10 +139,10 @@ export function CreateGroupModal({
         </h3>
 
         {/* Group Name Input */}
-        <div className="form-control mb-4">
+        <div className="mb-4">
           <label htmlFor="group-name" className="label">
-            <span className="label-text">Group Name</span>
-            <span className="label-text-alt text-base-content/80">
+            <span>Group Name</span>
+            <span className="text-base-content/80">
               {groupName.length}/{GROUP_CONSTRAINTS.MAX_NAME_LENGTH}
             </span>
           </label>
@@ -150,7 +150,7 @@ export function CreateGroupModal({
             id="group-name"
             type="text"
             placeholder={autoNamePreview}
-            className="input input-bordered w-full"
+            className="input w-full"
             value={groupName}
             onChange={(e) =>
               setGroupName(
@@ -160,19 +160,16 @@ export function CreateGroupModal({
             disabled={isCreating}
             aria-describedby="group-name-hint"
           />
-          <p
-            id="group-name-hint"
-            className="label-text-alt text-base-content/80 mt-1"
-          >
+          <p id="group-name-hint" className="text-base-content/80 mt-1">
             Leave empty to auto-generate from member names
           </p>
         </div>
 
         {/* Member Search */}
-        <div className="form-control mb-4">
+        <div className="mb-4">
           <label htmlFor="member-search" className="label">
-            <span className="label-text">Add Members</span>
-            <span className="label-text-alt">
+            <span>Add Members</span>
+            <span>
               {selectedMembers.length}/{GROUP_CONSTRAINTS.MAX_MEMBERS - 1}{' '}
               selected
             </span>
@@ -182,14 +179,14 @@ export function CreateGroupModal({
             ref={searchInputRef}
             type="text"
             placeholder="Search connections..."
-            className="input input-bordered w-full"
+            className="input w-full"
             value={searchQuery}
             onChange={handleSearchChange}
             disabled={isCreating || isAtCapacity}
             aria-describedby="search-hint"
           />
           {isAtCapacity && (
-            <p id="search-hint" className="label-text-alt text-warning mt-1">
+            <p id="search-hint" className="text-warning mt-1">
               Maximum members reached
             </p>
           )}
diff --git a/src/components/payment/PaymentHistory/PaymentHistory.tsx b/src/components/payment/PaymentHistory/PaymentHistory.tsx
index 7a471888..c4ec1e46 100644
--- a/src/components/payment/PaymentHistory/PaymentHistory.tsx
+++ b/src/components/payment/PaymentHistory/PaymentHistory.tsx
@@ -243,13 +243,13 @@ export const PaymentHistory: React.FC<PaymentHistoryProps> = ({
       {/* Filters */}
       {showFilters && (
         <div className="flex flex-col gap-2 sm:flex-row sm:gap-4">
-          <div className="form-control">
+          <div>
             <label htmlFor="status-filter" className="label">
-              <span className="label-text">Status</span>
+              <span>Status</span>
             </label>
             <select
               id="status-filter"
-              className="select select-bordered min-h-11 w-full sm:w-auto"
+              className="select min-h-11 w-full sm:w-auto"
               value={statusFilter}
               onChange={(e) => setStatusFilter(e.target.value as StatusFilter)}
             >
@@ -261,13 +261,13 @@ export const PaymentHistory: React.FC<PaymentHistoryProps> = ({
             </select>
           </div>
 
-          <div className="form-control">
+          <div>
             <label htmlFor="provider-filter" className="label">
-              <span className="label-text">Provider</span>
+              <span>Provider</span>
             </label>
             <select
               id="provider-filter"
-              className="select select-bordered min-h-11 w-full sm:w-auto"
+              className="select min-h-11 w-full sm:w-auto"
               value={providerFilter}
               onChange={(e) =>
                 setProviderFilter(e.target.value as typeof providerFilter)
diff --git a/src/components/privacy/ConsentModal/ConsentModal.tsx b/src/components/privacy/ConsentModal/ConsentModal.tsx
index f61aec93..f2f5f10f 100644
--- a/src/components/privacy/ConsentModal/ConsentModal.tsx
+++ b/src/components/privacy/ConsentModal/ConsentModal.tsx
@@ -305,7 +305,7 @@ export function ConsentModal({
                           )}
                         </div>
 
-                        <div className="form-control">
+                        <div>
                           <label className="label cursor-pointer">
                             <input
                               type="checkbox"
diff --git a/src/styles/colorblind-patterns.css b/src/styles/colorblind-patterns.css
index 53d4e772..a81eb3b0 100644
--- a/src/styles/colorblind-patterns.css
+++ b/src/styles/colorblind-patterns.css
@@ -292,7 +292,7 @@
   }
 
   /* Cards and Containers */
-  .card-bordered {
+  .card-border {
     border-style: solid;
     border-width: 2px;
   }
diff --git a/tests/e2e/pages/ComponentsPage.ts b/tests/e2e/pages/ComponentsPage.ts
index 559cd7dc..cc8e8f8e 100644
--- a/tests/e2e/pages/ComponentsPage.ts
+++ b/tests/e2e/pages/ComponentsPage.ts
@@ -33,10 +33,12 @@ export class ComponentsPage extends BasePage {
     modalClose: '.modal button:has-text("Close"), .modal button:has-text("×")',
 
     // Form elements
-    formControl: '.form-control',
+    // DaisyUI v5 removed .form-control / .label-text-alt; field wrappers are now
+    // plain elements and help text is keyed on its `-help` id.
+    formControl: 'label.label, fieldset.fieldset',
     formLabel: 'label',
     formError: '.text-error, [role="alert"]',
-    formHelp: '.label-text-alt, [id$="-help"]',
+    formHelp: '[id$="-help"]',
     submitButton: 'button[type="submit"]',
     resetButton: 'button[type="reset"]',
 
diff --git a/tests/e2e/tests/form-submission.spec.ts b/tests/e2e/tests/form-submission.spec.ts
index 3462b6ce..1c06e185 100644
--- a/tests/e2e/tests/form-submission.spec.ts
+++ b/tests/e2e/tests/form-submission.spec.ts
@@ -51,9 +51,13 @@ test.describe('Form Submission', () => {
   });
 
   test('required fields show indicators', async ({ page }) => {
-    // The contact form uses <span class="label-text-alt text-error">*</span> for required indicators
-    // Check that asterisks are visible next to required field labels
-    const requiredIndicators = page.locator('.label-text-alt.text-error');
+    // Each required field's label carries an asterisk: <span class="text-error">*</span>
+    // inside <label class="label">. Match by the asterisk text within field labels so
+    // the selector isn't coupled to DaisyUI class names (error-message spans also use
+    // .text-error but contain the message text, not "*").
+    const requiredIndicators = page
+      .locator('label.label span.text-error')
+      .filter({ hasText: '*' });
 
     // Contact form has 4 required fields: name, email, subject, message
     await expect(requiredIndicators).toHaveCount(4);
diff --git a/tests/e2e/tests/mobile-form-inputs.spec.ts b/tests/e2e/tests/mobile-form-inputs.spec.ts
index 85d7c65b..4dd16f30 100644
--- a/tests/e2e/tests/mobile-form-inputs.spec.ts
+++ b/tests/e2e/tests/mobile-form-inputs.spec.ts
@@ -62,8 +62,10 @@ test.describe('Mobile Form Inputs', () => {
     await dismissCookieBanner(page);
     await waitForLayoutStability(page);
 
+    // DaisyUI v5 dropped .form-control; field wrappers are now fieldsets or the
+    // div/label groups around an input. Match those plus any legacy input-group.
     const formGroups = await page
-      .locator('[class*="form-control"], [class*="input-group"]')
+      .locator('fieldset.fieldset, label.label, [class*="input-group"]')
       .all();
 
     for (const group of formGroups) {