diff --git a/components/application-form.html b/components/application-form.html
index 95a10db8..de0a6eda 100644
--- a/components/application-form.html
+++ b/components/application-form.html
@@ -23,7 +23,7 @@
       <div class="bv-modal-backdrop" data-dismiss></div>
 
       <!-- Inner content container -->
-      <div class="modal-sheet">
+      <div class="bv-modal__panel modal-sheet" tabindex="-1">
           <!-- Header bar with updated styling -->
           <div class="modal-header">
             <h2
diff --git a/components/bug-fix-form.html b/components/bug-fix-form.html
index 473a6052..17ca9097 100644
--- a/components/bug-fix-form.html
+++ b/components/bug-fix-form.html
@@ -14,7 +14,7 @@
 >
   <div class="bv-modal-backdrop" data-dismiss></div>
 
-  <div class="modal-sheet">
+  <div class="bv-modal__panel modal-sheet" tabindex="-1">
     <!-- Header bar (sticky) with updated title styling -->
     <div class="modal-header">
       <h2
diff --git a/components/content-appeals-form.html b/components/content-appeals-form.html
index 98374c82..a454225e 100644
--- a/components/content-appeals-form.html
+++ b/components/content-appeals-form.html
@@ -4,13 +4,20 @@
 <div
   id="contentAppealsModal"
   class="bv-modal hidden items-start justify-center overflow-y-auto"
+  role="dialog"
+  aria-modal="true"
+  aria-labelledby="contentAppealsModalTitle"
+  aria-describedby="contentAppealsModalDescription"
 >
   <div class="bv-modal-backdrop" data-dismiss></div>
 
-  <div class="modal-sheet">
+  <div class="bv-modal__panel modal-sheet" tabindex="-1">
     <!-- Header bar (sticky) with improved title styling -->
     <div class="modal-header">
-      <h2 class="pb-2 text-3xl font-extrabold tracking-wide text-text">
+      <h2
+        id="contentAppealsModalTitle"
+        class="pb-2 text-3xl font-extrabold tracking-wide text-text"
+      >
         Content Appeals Form
       </h2>
       <button
@@ -34,7 +41,7 @@
       </button>
     </div>
 
-    <div class="modal-body">
+    <div id="contentAppealsModalDescription" class="modal-body">
       <div class="h-[80vh] w-full">
         <iframe
           src="./components/iframe_forms/iframe-content-appeals-form.html"
diff --git a/components/disclaimer.html b/components/disclaimer.html
index 0ecc8629..be55bfe5 100644
--- a/components/disclaimer.html
+++ b/components/disclaimer.html
@@ -10,7 +10,7 @@
   <div class="bv-modal-backdrop" data-dismiss></div>
 
   <!-- Outer container with wide layout, just like content-appeals-form -->
-  <div class="modal-sheet flex flex-col overflow-hidden" tabindex="-1">
+  <div class="bv-modal__panel modal-sheet flex flex-col overflow-hidden" tabindex="-1">
     <!-- Sticky top bar, if you want a top heading or 'X' button up here -->
     <div class="modal-header"></div>
 
diff --git a/components/feature-request-form.html b/components/feature-request-form.html
index a9150e33..71b3a73b 100644
--- a/components/feature-request-form.html
+++ b/components/feature-request-form.html
@@ -11,7 +11,7 @@
 >
   <div class="bv-modal-backdrop" data-dismiss></div>
 
-  <div class="modal-sheet">
+  <div class="bv-modal__panel modal-sheet" tabindex="-1">
     <!-- Header bar (sticky) with updated title styling -->
     <div class="modal-header">
       <h2
diff --git a/components/general-feedback-form.html b/components/general-feedback-form.html
index cbd32238..61bcdef6 100644
--- a/components/general-feedback-form.html
+++ b/components/general-feedback-form.html
@@ -15,7 +15,7 @@
 >
   <div class="bv-modal-backdrop" data-dismiss></div>
 
-  <div class="modal-sheet">
+  <div class="bv-modal__panel modal-sheet" tabindex="-1">
     <!-- Header bar (sticky) with updated title styling -->
     <div class="modal-header">
       <h2