diff --git a/app/assets/javascripts/feature_flags/components/form.vue b/app/assets/javascripts/feature_flags/components/form.vue
index 5462532829fb0fb1871f7624e9e231dff1babb51..e8ac31aef45e9b83a82dbb2e44c2177a70fab88d 100644
--- a/app/assets/javascripts/feature_flags/components/form.vue
+++ b/app/assets/javascripts/feature_flags/components/form.vue
@@ -1,6 +1,6 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
-import { GlButton } from '@gitlab/ui';
+import { GlButton, GlFormTextarea } from '@gitlab/ui';
 import { memoize, cloneDeep, isNumber, uniqueId } from 'lodash';
 import { s__ } from '~/locale';
 import RelatedIssuesRoot from '~/related_issues/components/related_issues_root.vue';
@@ -23,6 +23,7 @@ export default {
     GlButton,
     Strategy,
     RelatedIssuesRoot,
+    GlFormTextarea,
   },
   mixins: [featureFlagsMixin()],
   inject: {
@@ -159,24 +160,30 @@ export default {
     <fieldset>
       <div class="-gl-mx-5 gl-flex gl-flex-wrap">
         <div class="gl-mb-5 gl-w-full gl-px-5 md:gl-basis-1/3">
-          <label for="feature-flag-name" class="gl-font-bold"
-            >{{ s__('FeatureFlags|Name') }} *</label
-          >
-          <input id="feature-flag-name" v-model="formName" class="form-control" />
+          <label for="feature-flag-name" class="gl-font-bold">
+            {{ s__('FeatureFlags|Name') }}
+          </label>
+          <input
+            id="feature-flag-name"
+            v-model="formName"
+            class="form-control"
+            required
+            aria-required="true"
+          />
         </div>
       </div>
-
       <div class="-gl-mx-5 gl-flex gl-flex-wrap">
         <div class="gl-mb-5 gl-w-full gl-px-5 md:gl-basis-1/3">
           <label for="feature-flag-description" class="gl-font-bold">
-            {{ s__('FeatureFlags|Description') }}
+            {{ s__('FeatureFlags|Description (optional)') }}
           </label>
-          <textarea
+          <gl-form-textarea
             id="feature-flag-description"
             v-model="formDescription"
             class="form-control"
             rows="4"
-          ></textarea>
+            aria-required="false"
+          />
         </div>
       </div>
 
@@ -186,7 +193,6 @@ export default {
         :can-admin="true"
         :show-categorized-issues="false"
       />
-
       <div class="-gl-mx-5 gl-flex gl-flex-wrap">
         <div class="gl-mb-5 gl-w-full gl-px-5">
           <h4>{{ s__('FeatureFlags|Strategies') }}</h4>
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 84187e921a68b784dc9a094c01705c483d25de9b..271d53fd059b1cadf1a724489efb49f50bd3915d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -25187,7 +25187,7 @@ msgstr ""
 msgid "FeatureFlags|Delete feature flag"
 msgstr ""
 
-msgid "FeatureFlags|Description"
+msgid "FeatureFlags|Description (optional)"
 msgstr ""
 
 msgid "FeatureFlags|Edit Feature flag"