diff --git a/apps/spruce/src/components/EditableTagField/TagRow.tsx b/apps/spruce/src/components/EditableTagField/TagRow.tsx
index 9247a1810..19730fdf1 100644
--- a/apps/spruce/src/components/EditableTagField/TagRow.tsx
+++ b/apps/spruce/src/components/EditableTagField/TagRow.tsx
@@ -1,7 +1,7 @@
 import { useReducer, useMemo } from "react";
 import styled from "@emotion/styled";
 import IconButton from "@leafygreen-ui/icon-button";
-import TextInput from "@leafygreen-ui/text-input";
+import TextArea from "@leafygreen-ui/text-area";
 import { PlusButton } from "components/Buttons";
 import Icon from "components/Icon";
 import { size } from "constants/tokens";
@@ -33,82 +33,74 @@ export const TagRow: React.FC<TagRowProps> = ({
   const { canSave, isInputValid, key, shouldShowNewTag, value } = state;
 
   return (
-    <FlexColumnContainer
-      data-cy={!shouldShowNewTag ? "add-tag-button-row" : "user-tag-row"}
-    >
+    <>
       {shouldShowNewTag && (
-        <FlexContainer>
+        <FlexContainer data-cy="user-tag-row">
           <FlexColumnContainer>
-            <Section>
-              <TextInput
-                label="Key"
-                id={`tag_key_${tagId}`}
-                value={key}
-                onChange={(e) =>
-                  // @ts-expect-error: FIXME. This comment was added by an automated script.
-                  dispatch({ type: "updateTag", key: e.target.value })
-                }
-                data-cy="user-tag-key-field"
-              />
-            </Section>
+            <TextArea
+              label="Key"
+              id={`tag_key_${tagId}`}
+              value={key}
+              onChange={(e) =>
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
+                dispatch({ type: "updateTag", key: e.target.value })
+              }
+              data-cy="user-tag-key-field"
+            />
           </FlexColumnContainer>
           <FlexColumnContainer>
-            <Section>
-              <TextInput
-                label="Value"
-                id={`tag_value_${tagId}`}
-                value={value}
-                onChange={(e) =>
-                  // @ts-expect-error: FIXME. This comment was added by an automated script.
-                  dispatch({ type: "updateTag", value: e.target.value })
-                }
-                data-cy="user-tag-value-field"
-              />
-            </Section>
+            <TextArea
+              label="Value"
+              id={`tag_value_${tagId}`}
+              value={value}
+              onChange={(e) =>
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
+                dispatch({ type: "updateTag", value: e.target.value })
+              }
+              data-cy="user-tag-value-field"
+            />
           </FlexColumnContainer>
-          <IconButtonContainer>
-            {canSave ? (
-              <IconButton
-                aria-label="Update tag"
-                disabled={
-                  !isInputValid ||
+          {canSave ? (
+            <IconButton
+              aria-label="Update tag"
+              disabled={
+                !isInputValid ||
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
+                ((isNewTag || key !== tag.key) && !isValidKey(key))
+              }
+            >
+              <Icon
+                glyph="Checkmark"
+                data-cy="user-tag-edit-icon"
+                onClick={() => {
                   // @ts-expect-error: FIXME. This comment was added by an automated script.
-                  ((isNewTag || key !== tag.key) && !isValidKey(key))
-                }
-              >
-                <Icon
-                  glyph="Checkmark"
-                  data-cy="user-tag-edit-icon"
-                  onClick={() => {
-                    // @ts-expect-error: FIXME. This comment was added by an automated script.
-                    dispatch({
-                      type: isNewTag ? "cancelNewTag" : "inActive",
-                    });
+                  dispatch({
+                    type: isNewTag ? "cancelNewTag" : "inActive",
+                  });
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
+                  onUpdateTag(
+                    { key, value },
                     // @ts-expect-error: FIXME. This comment was added by an automated script.
-                    onUpdateTag(
-                      { key, value },
-                      // @ts-expect-error: FIXME. This comment was added by an automated script.
-                      !isNewTag && key !== tag.key ? tag.key : undefined,
-                    );
-                  }}
-                />
-              </IconButton>
-            ) : (
-              <IconButton aria-label="Delete Tag">
-                <Icon
-                  glyph="Trash"
-                  onClick={
-                    isNewTag
-                      ? // @ts-expect-error: FIXME. This comment was added by an automated script.
-                        () => dispatch({ type: "cancelNewTag" })
-                      : // @ts-expect-error: FIXME. This comment was added by an automated script.
-                        () => onDelete(tag.key)
-                  }
-                  data-cy="user-tag-trash-icon"
-                />
-              </IconButton>
-            )}
-          </IconButtonContainer>
+                    !isNewTag && key !== tag.key ? tag.key : undefined,
+                  );
+                }}
+              />
+            </IconButton>
+          ) : (
+            <IconButton aria-label="Delete Tag">
+              <Icon
+                glyph="Trash"
+                onClick={
+                  isNewTag
+                    ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+                      () => dispatch({ type: "cancelNewTag" })
+                    : // @ts-expect-error: FIXME. This comment was added by an automated script.
+                      () => onDelete(tag.key)
+                }
+                data-cy="user-tag-trash-icon"
+              />
+            </IconButton>
+          )}
         </FlexContainer>
       )}
       {!shouldShowNewTag && (
@@ -122,7 +114,7 @@ export const TagRow: React.FC<TagRowProps> = ({
           </PlusButton>
         </ButtonContainer>
       )}
-    </FlexColumnContainer>
+    </>
   );
 };
 
@@ -138,12 +130,6 @@ const FlexColumnContainer = styled.div`
   display: flex;
   flex-direction: column;
   margin-right: ${size.xs};
-`;
-
-const Section = styled(FlexColumnContainer)`
   margin-top: ${size.m};
-`;
-
-const IconButtonContainer = styled.div`
-  margin-bottom: ${size.xxs};
+  flex-grow: 1;
 `;
diff --git a/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot b/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot
index 3853bb70d..fad85a902 100644
--- a/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot
+++ b/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot
@@ -1,504 +1,277 @@
 <div>
   <div
-    class="css-1l8756f-FlexColumnContainer e1zn6k0"
+    class="css-19h29oo-FlexColumnContainer e1zn6k0"
   >
     <div
-      class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+      class="css-w1f0xx-FlexContainer e161fbrp1"
       data-cy="user-tag-row"
     >
       <div
-        class="css-w1f0xx-FlexContainer e161fbrp3"
+        class="css-kqpb1n-FlexColumnContainer e161fbrp0"
       >
         <div
-          class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+          class="leafygreen-ui-1iyoj2o"
         >
-          <div
-            class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
+          <label
+            class="leafygreen-ui-1fi5x3a"
+            for="tag_key_1"
           >
-            <div
-              class="leafygreen-ui-1br9h7w"
-              data-lgid="lg-text_input"
-            >
-              <div
-                class="leafygreen-ui-au9iil"
-              >
-                <label
-                  class="leafygreen-ui-6bdaia"
-                  data-lgid="lg-label"
-                  data-testid="lg-form_field-label"
-                  for="tag_key_1"
-                  id="lg-form_field-label-3"
-                >
-                  Key
-                </label>
-              </div>
-              <div
-                class="leafygreen-ui-109lyo9"
-              >
-                <div
-                  class="leafygreen-ui-1ago99h"
-                >
-                  <input
-                    aria-describedby=""
-                    aria-disabled="false"
-                    aria-invalid="false"
-                    aria-labelledby="lg-form_field-label-3"
-                    autocomplete="on"
-                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                    data-cy="user-tag-key-field"
-                    id="tag_key_1"
-                    required=""
-                    type="text"
-                    value="keyA"
-                  />
-                </div>
-              </div>
-              <div
-                aria-live="polite"
-                aria-relevant="all"
-                class="leafygreen-ui-11ydt2g"
-                data-lgid="lg-form_field-feedback"
-                data-testid="lg-form_field-feedback"
-                id="lg-form_field-feedback-5"
-              />
-            </div>
-          </div>
+            Key
+          </label>
+          <textarea
+            class="leafygreen-ui-18em0fn"
+            data-cy="user-tag-key-field"
+            id="tag_key_1"
+            title="Key"
+          >
+            keyA
+          </textarea>
         </div>
+      </div>
+      <div
+        class="css-kqpb1n-FlexColumnContainer e161fbrp0"
+      >
         <div
-          class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+          class="leafygreen-ui-1iyoj2o"
         >
-          <div
-            class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
+          <label
+            class="leafygreen-ui-1fi5x3a"
+            for="tag_value_1"
           >
-            <div
-              class="leafygreen-ui-1br9h7w"
-              data-lgid="lg-text_input"
-            >
-              <div
-                class="leafygreen-ui-au9iil"
-              >
-                <label
-                  class="leafygreen-ui-6bdaia"
-                  data-lgid="lg-label"
-                  data-testid="lg-form_field-label"
-                  for="tag_value_1"
-                  id="lg-form_field-label-7"
-                >
-                  Value
-                </label>
-              </div>
-              <div
-                class="leafygreen-ui-109lyo9"
-              >
-                <div
-                  class="leafygreen-ui-1ago99h"
-                >
-                  <input
-                    aria-describedby=""
-                    aria-disabled="false"
-                    aria-invalid="false"
-                    aria-labelledby="lg-form_field-label-7"
-                    autocomplete="on"
-                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                    data-cy="user-tag-value-field"
-                    id="tag_value_1"
-                    required=""
-                    type="text"
-                    value="valueA"
-                  />
-                </div>
-              </div>
-              <div
-                aria-live="polite"
-                aria-relevant="all"
-                class="leafygreen-ui-11ydt2g"
-                data-lgid="lg-form_field-feedback"
-                data-testid="lg-form_field-feedback"
-                id="lg-form_field-feedback-9"
-              />
-            </div>
-          </div>
+            Value
+          </label>
+          <textarea
+            class="leafygreen-ui-18em0fn"
+            data-cy="user-tag-value-field"
+            id="tag_value_1"
+            title="Value"
+          >
+            valueA
+          </textarea>
         </div>
+      </div>
+      <button
+        aria-disabled="false"
+        aria-label="Delete Tag"
+        class="leafygreen-ui-tcjr3n"
+        tabindex="0"
+      >
         <div
-          class="css-17vcddu-IconButtonContainer e161fbrp0"
+          class="leafygreen-ui-xhlipt"
         >
-          <button
-            aria-disabled="false"
-            aria-label="Delete Tag"
-            class="leafygreen-ui-tcjr3n"
-            tabindex="0"
+          <svg
+            aria-label="Trash Icon"
+            class=""
+            data-cy="user-tag-trash-icon"
+            fill="none"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <div
-              class="leafygreen-ui-xhlipt"
-            >
-              <svg
-                aria-label="Trash Icon"
-                class=""
-                data-cy="user-tag-trash-icon"
-                fill="none"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  clip-rule="evenodd"
-                  d="M5 2a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1h2a1 1 0 0 1 1 1v1H2V3a1 1 0 0 1 1-1h2Zm9 3H2l1.678 8.392A2 2 0 0 0 5.64 15h4.72a2 2 0 0 0 1.962-1.608L14 5Z"
-                  fill="currentColor"
-                  fill-rule="evenodd"
-                />
-              </svg>
-            </div>
-          </button>
+            <path
+              clip-rule="evenodd"
+              d="M5 2a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1h2a1 1 0 0 1 1 1v1H2V3a1 1 0 0 1 1-1h2Zm9 3H2l1.678 8.392A2 2 0 0 0 5.64 15h4.72a2 2 0 0 0 1.962-1.608L14 5Z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
-      </div>
+      </button>
     </div>
     <div
-      class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+      class="css-w1f0xx-FlexContainer e161fbrp1"
       data-cy="user-tag-row"
     >
       <div
-        class="css-w1f0xx-FlexContainer e161fbrp3"
+        class="css-kqpb1n-FlexColumnContainer e161fbrp0"
       >
         <div
-          class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+          class="leafygreen-ui-1iyoj2o"
         >
-          <div
-            class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
+          <label
+            class="leafygreen-ui-1fi5x3a"
+            for="tag_key_2"
           >
-            <div
-              class="leafygreen-ui-1br9h7w"
-              data-lgid="lg-text_input"
-            >
-              <div
-                class="leafygreen-ui-au9iil"
-              >
-                <label
-                  class="leafygreen-ui-6bdaia"
-                  data-lgid="lg-label"
-                  data-testid="lg-form_field-label"
-                  for="tag_key_2"
-                  id="lg-form_field-label-11"
-                >
-                  Key
-                </label>
-              </div>
-              <div
-                class="leafygreen-ui-109lyo9"
-              >
-                <div
-                  class="leafygreen-ui-1ago99h"
-                >
-                  <input
-                    aria-describedby=""
-                    aria-disabled="false"
-                    aria-invalid="false"
-                    aria-labelledby="lg-form_field-label-11"
-                    autocomplete="on"
-                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                    data-cy="user-tag-key-field"
-                    id="tag_key_2"
-                    required=""
-                    type="text"
-                    value="keyB"
-                  />
-                </div>
-              </div>
-              <div
-                aria-live="polite"
-                aria-relevant="all"
-                class="leafygreen-ui-11ydt2g"
-                data-lgid="lg-form_field-feedback"
-                data-testid="lg-form_field-feedback"
-                id="lg-form_field-feedback-13"
-              />
-            </div>
-          </div>
+            Key
+          </label>
+          <textarea
+            class="leafygreen-ui-18em0fn"
+            data-cy="user-tag-key-field"
+            id="tag_key_2"
+            title="Key"
+          >
+            keyB
+          </textarea>
         </div>
+      </div>
+      <div
+        class="css-kqpb1n-FlexColumnContainer e161fbrp0"
+      >
         <div
-          class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+          class="leafygreen-ui-1iyoj2o"
         >
-          <div
-            class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
+          <label
+            class="leafygreen-ui-1fi5x3a"
+            for="tag_value_2"
           >
-            <div
-              class="leafygreen-ui-1br9h7w"
-              data-lgid="lg-text_input"
-            >
-              <div
-                class="leafygreen-ui-au9iil"
-              >
-                <label
-                  class="leafygreen-ui-6bdaia"
-                  data-lgid="lg-label"
-                  data-testid="lg-form_field-label"
-                  for="tag_value_2"
-                  id="lg-form_field-label-15"
-                >
-                  Value
-                </label>
-              </div>
-              <div
-                class="leafygreen-ui-109lyo9"
-              >
-                <div
-                  class="leafygreen-ui-1ago99h"
-                >
-                  <input
-                    aria-describedby=""
-                    aria-disabled="false"
-                    aria-invalid="false"
-                    aria-labelledby="lg-form_field-label-15"
-                    autocomplete="on"
-                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                    data-cy="user-tag-value-field"
-                    id="tag_value_2"
-                    required=""
-                    type="text"
-                    value="valueB"
-                  />
-                </div>
-              </div>
-              <div
-                aria-live="polite"
-                aria-relevant="all"
-                class="leafygreen-ui-11ydt2g"
-                data-lgid="lg-form_field-feedback"
-                data-testid="lg-form_field-feedback"
-                id="lg-form_field-feedback-17"
-              />
-            </div>
-          </div>
+            Value
+          </label>
+          <textarea
+            class="leafygreen-ui-18em0fn"
+            data-cy="user-tag-value-field"
+            id="tag_value_2"
+            title="Value"
+          >
+            valueB
+          </textarea>
         </div>
+      </div>
+      <button
+        aria-disabled="false"
+        aria-label="Delete Tag"
+        class="leafygreen-ui-tcjr3n"
+        tabindex="0"
+      >
         <div
-          class="css-17vcddu-IconButtonContainer e161fbrp0"
+          class="leafygreen-ui-xhlipt"
         >
-          <button
-            aria-disabled="false"
-            aria-label="Delete Tag"
-            class="leafygreen-ui-tcjr3n"
-            tabindex="0"
+          <svg
+            aria-label="Trash Icon"
+            class=""
+            data-cy="user-tag-trash-icon"
+            fill="none"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <div
-              class="leafygreen-ui-xhlipt"
-            >
-              <svg
-                aria-label="Trash Icon"
-                class=""
-                data-cy="user-tag-trash-icon"
-                fill="none"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  clip-rule="evenodd"
-                  d="M5 2a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1h2a1 1 0 0 1 1 1v1H2V3a1 1 0 0 1 1-1h2Zm9 3H2l1.678 8.392A2 2 0 0 0 5.64 15h4.72a2 2 0 0 0 1.962-1.608L14 5Z"
-                  fill="currentColor"
-                  fill-rule="evenodd"
-                />
-              </svg>
-            </div>
-          </button>
+            <path
+              clip-rule="evenodd"
+              d="M5 2a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1h2a1 1 0 0 1 1 1v1H2V3a1 1 0 0 1 1-1h2Zm9 3H2l1.678 8.392A2 2 0 0 0 5.64 15h4.72a2 2 0 0 0 1.962-1.608L14 5Z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
-      </div>
+      </button>
     </div>
     <div
-      class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+      class="css-w1f0xx-FlexContainer e161fbrp1"
       data-cy="user-tag-row"
     >
       <div
-        class="css-w1f0xx-FlexContainer e161fbrp3"
+        class="css-kqpb1n-FlexColumnContainer e161fbrp0"
       >
         <div
-          class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+          class="leafygreen-ui-1iyoj2o"
         >
-          <div
-            class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
+          <label
+            class="leafygreen-ui-1fi5x3a"
+            for="tag_key_3"
+          >
+            Key
+          </label>
+          <textarea
+            class="leafygreen-ui-18em0fn"
+            data-cy="user-tag-key-field"
+            id="tag_key_3"
+            title="Key"
           >
-            <div
-              class="leafygreen-ui-1br9h7w"
-              data-lgid="lg-text_input"
-            >
-              <div
-                class="leafygreen-ui-au9iil"
-              >
-                <label
-                  class="leafygreen-ui-6bdaia"
-                  data-lgid="lg-label"
-                  data-testid="lg-form_field-label"
-                  for="tag_key_3"
-                  id="lg-form_field-label-19"
-                >
-                  Key
-                </label>
-              </div>
-              <div
-                class="leafygreen-ui-109lyo9"
-              >
-                <div
-                  class="leafygreen-ui-1ago99h"
-                >
-                  <input
-                    aria-describedby=""
-                    aria-disabled="false"
-                    aria-invalid="false"
-                    aria-labelledby="lg-form_field-label-19"
-                    autocomplete="on"
-                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                    data-cy="user-tag-key-field"
-                    id="tag_key_3"
-                    required=""
-                    type="text"
-                    value="keyC"
-                  />
-                </div>
-              </div>
-              <div
-                aria-live="polite"
-                aria-relevant="all"
-                class="leafygreen-ui-11ydt2g"
-                data-lgid="lg-form_field-feedback"
-                data-testid="lg-form_field-feedback"
-                id="lg-form_field-feedback-21"
-              />
-            </div>
-          </div>
+            keyC
+          </textarea>
         </div>
+      </div>
+      <div
+        class="css-kqpb1n-FlexColumnContainer e161fbrp0"
+      >
         <div
-          class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
+          class="leafygreen-ui-1iyoj2o"
         >
-          <div
-            class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
+          <label
+            class="leafygreen-ui-1fi5x3a"
+            for="tag_value_3"
+          >
+            Value
+          </label>
+          <textarea
+            class="leafygreen-ui-18em0fn"
+            data-cy="user-tag-value-field"
+            id="tag_value_3"
+            title="Value"
           >
-            <div
-              class="leafygreen-ui-1br9h7w"
-              data-lgid="lg-text_input"
-            >
-              <div
-                class="leafygreen-ui-au9iil"
-              >
-                <label
-                  class="leafygreen-ui-6bdaia"
-                  data-lgid="lg-label"
-                  data-testid="lg-form_field-label"
-                  for="tag_value_3"
-                  id="lg-form_field-label-23"
-                >
-                  Value
-                </label>
-              </div>
-              <div
-                class="leafygreen-ui-109lyo9"
-              >
-                <div
-                  class="leafygreen-ui-1ago99h"
-                >
-                  <input
-                    aria-describedby=""
-                    aria-disabled="false"
-                    aria-invalid="false"
-                    aria-labelledby="lg-form_field-label-23"
-                    autocomplete="on"
-                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                    data-cy="user-tag-value-field"
-                    id="tag_value_3"
-                    required=""
-                    type="text"
-                    value="valueC"
-                  />
-                </div>
-              </div>
-              <div
-                aria-live="polite"
-                aria-relevant="all"
-                class="leafygreen-ui-11ydt2g"
-                data-lgid="lg-form_field-feedback"
-                data-testid="lg-form_field-feedback"
-                id="lg-form_field-feedback-25"
-              />
-            </div>
-          </div>
+            valueC
+          </textarea>
         </div>
+      </div>
+      <button
+        aria-disabled="false"
+        aria-label="Delete Tag"
+        class="leafygreen-ui-tcjr3n"
+        tabindex="0"
+      >
         <div
-          class="css-17vcddu-IconButtonContainer e161fbrp0"
+          class="leafygreen-ui-xhlipt"
         >
-          <button
-            aria-disabled="false"
-            aria-label="Delete Tag"
-            class="leafygreen-ui-tcjr3n"
-            tabindex="0"
+          <svg
+            aria-label="Trash Icon"
+            class=""
+            data-cy="user-tag-trash-icon"
+            fill="none"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <div
-              class="leafygreen-ui-xhlipt"
-            >
-              <svg
-                aria-label="Trash Icon"
-                class=""
-                data-cy="user-tag-trash-icon"
-                fill="none"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  clip-rule="evenodd"
-                  d="M5 2a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1h2a1 1 0 0 1 1 1v1H2V3a1 1 0 0 1 1-1h2Zm9 3H2l1.678 8.392A2 2 0 0 0 5.64 15h4.72a2 2 0 0 0 1.962-1.608L14 5Z"
-                  fill="currentColor"
-                  fill-rule="evenodd"
-                />
-              </svg>
-            </div>
-          </button>
+            <path
+              clip-rule="evenodd"
+              d="M5 2a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1h2a1 1 0 0 1 1 1v1H2V3a1 1 0 0 1 1-1h2Zm9 3H2l1.678 8.392A2 2 0 0 0 5.64 15h4.72a2 2 0 0 0 1.962-1.608L14 5Z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
         </div>
-      </div>
+      </button>
     </div>
     <div
-      class="css-1lpxfqd-FlexColumnContainer e161fbrp2"
-      data-cy="add-tag-button-row"
+      class="css-pylksp-ButtonContainer e161fbrp2"
     >
-      <div
-        class="css-pylksp-ButtonContainer e161fbrp4"
+      <button
+        aria-disabled="false"
+        class="lg-ui-button-0000 leafygreen-ui-xcwxw8"
+        data-cy="add-tag-button"
+        type="button"
       >
-        <button
-          aria-disabled="false"
-          class="lg-ui-button-0000 leafygreen-ui-xcwxw8"
-          data-cy="add-tag-button"
-          type="button"
+        <div
+          class="leafygreen-ui-v038xi"
+        />
+        <div
+          class="leafygreen-ui-v95oty"
         >
-          <div
-            class="leafygreen-ui-v038xi"
-          />
-          <div
-            class="leafygreen-ui-v95oty"
+          <svg
+            alt=""
+            aria-hidden="true"
+            class="leafygreen-ui-18si895"
+            fill="none"
+            height="16"
+            role="presentation"
+            viewBox="0 0 16 16"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            <svg
-              alt=""
-              aria-hidden="true"
-              class="leafygreen-ui-18si895"
-              fill="none"
-              height="16"
-              role="presentation"
-              viewBox="0 0 16 16"
-              width="16"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M7.5 2a1 1 0 0 0-1 1v3.5H3a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h3.5V13a1 1 0 0 0 1 1h1a1 1 0 0 0 1-1V9.5H13a1 1 0 0 0 1-1v-1a1 1 0 0 0-1-1H9.5V3a1 1 0 0 0-1-1h-1Z"
-                fill="currentColor"
-                fill-rule="evenodd"
-              />
-            </svg>
-            Add Tag
-          </div>
-        </button>
-      </div>
+            <path
+              clip-rule="evenodd"
+              d="M7.5 2a1 1 0 0 0-1 1v3.5H3a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h3.5V13a1 1 0 0 0 1 1h1a1 1 0 0 0 1-1V9.5H13a1 1 0 0 0 1-1v-1a1 1 0 0 0-1-1H9.5V3a1 1 0 0 0-1-1h-1Z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
+          Add Tag
+        </div>
+      </button>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/apps/spruce/src/components/EditableTagField/index.tsx b/apps/spruce/src/components/EditableTagField/index.tsx
index 9032ee0f6..99a817ad2 100644
--- a/apps/spruce/src/components/EditableTagField/index.tsx
+++ b/apps/spruce/src/components/EditableTagField/index.tsx
@@ -86,5 +86,5 @@ const FlexColumnContainer = styled.div`
   display: flex;
   flex-direction: column;
   margin-right: ${size.xs};
-  max-width: 70%;
+  max-width: 100%;
 `;
diff --git a/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot b/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot
index a36716cc5..635beee8a 100644
--- a/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot
+++ b/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot
@@ -61,8 +61,8 @@
             class="leafygreen-ui-6bdaia"
             data-lgid="lg-label"
             data-testid="lg-form_field-label"
-            for="lg-form_field-input-31"
-            id="lg-form_field-label-28"
+            for="lg-form_field-input-7"
+            id="lg-form_field-label-4"
           >
             key
           </label>
@@ -77,10 +77,10 @@
               aria-describedby=""
               aria-disabled="false"
               aria-invalid="false"
-              aria-labelledby="lg-form_field-label-28"
+              aria-labelledby="lg-form_field-label-4"
               autocomplete="on"
               class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-              id="lg-form_field-input-31"
+              id="lg-form_field-input-7"
               placeholder="key"
               required=""
               type="text"
@@ -94,7 +94,7 @@
           class="leafygreen-ui-11ydt2g"
           data-lgid="lg-form_field-feedback"
           data-testid="lg-form_field-feedback"
-          id="lg-form_field-feedback-30"
+          id="lg-form_field-feedback-6"
         />
       </div>
       <div
@@ -108,8 +108,8 @@
             class="leafygreen-ui-6bdaia"
             data-lgid="lg-label"
             data-testid="lg-form_field-label"
-            for="lg-form_field-input-35"
-            id="lg-form_field-label-32"
+            for="lg-form_field-input-11"
+            id="lg-form_field-label-8"
           >
             value
           </label>
@@ -124,10 +124,10 @@
               aria-describedby=""
               aria-disabled="false"
               aria-invalid="false"
-              aria-labelledby="lg-form_field-label-32"
+              aria-labelledby="lg-form_field-label-8"
               autocomplete="on"
               class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-              id="lg-form_field-input-35"
+              id="lg-form_field-input-11"
               placeholder="value"
               required=""
               type="text"
@@ -141,7 +141,7 @@
           class="leafygreen-ui-11ydt2g"
           data-lgid="lg-form_field-feedback"
           data-testid="lg-form_field-feedback"
-          id="lg-form_field-feedback-34"
+          id="lg-form_field-feedback-10"
         />
       </div>
       <button
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot b/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot
index 74518d848..767c94a48 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot
@@ -20,8 +20,8 @@
               class="leafygreen-ui-6bdaia"
               data-lgid="lg-label"
               data-testid="lg-form_field-label"
-              for="lg-form_field-input-70"
-              id="lg-form_field-label-67"
+              for="lg-form_field-input-46"
+              id="lg-form_field-label-43"
             >
               Filter by Failed Tests
             </label>
@@ -36,10 +36,10 @@
                 aria-describedby=""
                 aria-disabled="false"
                 aria-invalid="false"
-                aria-labelledby="lg-form_field-label-67"
+                aria-labelledby="lg-form_field-label-43"
                 autocomplete="on"
                 class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                id="lg-form_field-input-70"
+                id="lg-form_field-input-46"
                 placeholder="Search test name regex"
                 required=""
                 type="search"
@@ -53,7 +53,7 @@
             class="leafygreen-ui-11ydt2g"
             data-lgid="lg-form_field-feedback"
             data-testid="lg-form_field-feedback"
-            id="lg-form_field-feedback-69"
+            id="lg-form_field-feedback-45"
           />
         </div>
         <div
diff --git a/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot b/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot
index b3b775957..bfbb6d430 100644
--- a/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot
+++ b/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot
@@ -4,8 +4,8 @@
     data-lgid="lg-select"
   >
     <button
-      aria-controls="select-225-menu"
-      aria-describedby="select-225-description"
+      aria-controls="select-201-menu"
+      aria-describedby="select-201-description"
       aria-disabled="false"
       aria-expanded="false"
       aria-invalid="false"
@@ -13,7 +13,7 @@
       class="lg-ui-button-0000 leafygreen-ui-c19aul"
       data-lgid="lg-button"
       data-testid="leafygreen-ui-select-menubutton"
-      id="select-226"
+      id="select-202"
       type="button"
       value="10"
     >
diff --git a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot
index 2f3e5ef4f..fc5fa14b9 100644
--- a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot
+++ b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot
@@ -42,23 +42,23 @@
                     <label
                       class="leafygreen-ui-qj0u2k"
                       data-lgid="lg-label"
-                      for="select-244"
-                      id="select-243-label"
+                      for="select-220"
+                      id="select-219-label"
                     >
                       Project Cloning Method
                     </label>
                   </div>
                   <button
-                    aria-controls="select-243-menu"
-                    aria-describedby="select-243-description"
+                    aria-controls="select-219-menu"
+                    aria-describedby="select-219-description"
                     aria-disabled="false"
                     aria-expanded="false"
                     aria-invalid="false"
-                    aria-labelledby="select-243-label"
+                    aria-labelledby="select-219-label"
                     class="lg-ui-button-0000 leafygreen-ui-1p6i2zy"
                     data-lgid="lg-button"
                     data-testid="leafygreen-ui-select-menubutton"
-                    id="select-244"
+                    id="select-220"
                     type="button"
                     value="legacy-ssh"
                   >
@@ -184,8 +184,8 @@
                                 class="leafygreen-ui-6bdaia"
                                 data-lgid="lg-label"
                                 data-testid="lg-form_field-label"
-                                for="lg-form_field-input-248"
-                                id="lg-form_field-label-245"
+                                for="lg-form_field-input-224"
+                                id="lg-form_field-label-221"
                               >
                                 key
                               </label>
@@ -200,10 +200,10 @@
                                   aria-describedby=""
                                   aria-disabled="false"
                                   aria-invalid="false"
-                                  aria-labelledby="lg-form_field-label-245"
+                                  aria-labelledby="lg-form_field-label-221"
                                   autocomplete="on"
                                   class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                                  id="lg-form_field-input-248"
+                                  id="lg-form_field-input-224"
                                   required=""
                                   type="text"
                                   value="Sample Input"
@@ -216,7 +216,7 @@
                               class="leafygreen-ui-11ydt2g"
                               data-lgid="lg-form_field-feedback"
                               data-testid="lg-form_field-feedback"
-                              id="lg-form_field-feedback-247"
+                              id="lg-form_field-feedback-223"
                             />
                           </div>
                         </div>
@@ -239,8 +239,8 @@
                                 class="leafygreen-ui-6bdaia"
                                 data-lgid="lg-label"
                                 data-testid="lg-form_field-label"
-                                for="lg-form_field-input-252"
-                                id="lg-form_field-label-249"
+                                for="lg-form_field-input-228"
+                                id="lg-form_field-label-225"
                               >
                                 value
                               </label>
@@ -255,10 +255,10 @@
                                   aria-describedby=""
                                   aria-disabled="false"
                                   aria-invalid="false"
-                                  aria-labelledby="lg-form_field-label-249"
+                                  aria-labelledby="lg-form_field-label-225"
                                   autocomplete="on"
                                   class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-                                  id="lg-form_field-input-252"
+                                  id="lg-form_field-input-228"
                                   required=""
                                   type="text"
                                   value="Sample Input"
@@ -271,7 +271,7 @@
                               class="leafygreen-ui-11ydt2g"
                               data-lgid="lg-form_field-feedback"
                               data-testid="lg-form_field-feedback"
-                              id="lg-form_field-feedback-251"
+                              id="lg-form_field-feedback-227"
                             />
                           </div>
                         </div>
@@ -328,13 +328,13 @@
                 >
                   <label
                     class="leafygreen-ui-1fi5x3a"
-                    for="textarea-253"
+                    for="textarea-229"
                   >
                     Valid Projects
                   </label>
                   <textarea
                     class="leafygreen-ui-18em0fn"
-                    id="textarea-253"
+                    id="textarea-229"
                     rows="5"
                     title="Valid Projects"
                   />
diff --git a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot
index 3c4f8ad37..23bd1b79b 100644
--- a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot
+++ b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot
@@ -39,16 +39,16 @@
                   <label
                     class="leafygreen-ui-1srek1y"
                     data-lgid="lg-label"
-                    for="checkbox-254"
-                    id="checkbox-254-label"
+                    for="checkbox-230"
+                    id="checkbox-230-label"
                   >
                     <input
                       aria-checked="false"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-254-label"
+                      aria-labelledby="checkbox-230-label"
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-254"
+                      id="checkbox-230"
                       type="checkbox"
                     />
                     <div
@@ -98,16 +98,16 @@
                   <label
                     class="leafygreen-ui-1srek1y"
                     data-lgid="lg-label"
-                    for="checkbox-255"
-                    id="checkbox-255-label"
+                    for="checkbox-231"
+                    id="checkbox-231-label"
                   >
                     <input
                       aria-checked="false"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-255-label"
+                      aria-labelledby="checkbox-231-label"
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-255"
+                      id="checkbox-231"
                       type="checkbox"
                     />
                     <div
@@ -157,16 +157,16 @@
                   <label
                     class="leafygreen-ui-1srek1y"
                     data-lgid="lg-label"
-                    for="checkbox-256"
-                    id="checkbox-256-label"
+                    for="checkbox-232"
+                    id="checkbox-232-label"
                   >
                     <input
                       aria-checked="false"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-256-label"
+                      aria-labelledby="checkbox-232-label"
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-256"
+                      id="checkbox-232"
                       type="checkbox"
                     />
                     <div
@@ -216,17 +216,17 @@
                   <label
                     class="leafygreen-ui-1srek1y"
                     data-lgid="lg-label"
-                    for="checkbox-257"
-                    id="checkbox-257-label"
+                    for="checkbox-233"
+                    id="checkbox-233-label"
                   >
                     <input
                       aria-checked="true"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-257-label"
+                      aria-labelledby="checkbox-233-label"
                       checked=""
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-257"
+                      id="checkbox-233"
                       type="checkbox"
                     />
                     <div
@@ -284,7 +284,7 @@
                     >
                       <input
                         aria-checked="false"
-                        aria-describedby="lg-258"
+                        aria-describedby="lg-234"
                         aria-disabled="false"
                         class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
                         id="radio-group--0"
@@ -311,7 +311,7 @@
                     >
                       <input
                         aria-checked="false"
-                        aria-describedby="lg-259"
+                        aria-describedby="lg-235"
                         aria-disabled="false"
                         class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
                         id="radio-group--1"
diff --git a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot
index ca1eb5aa5..46deebcf3 100644
--- a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot
+++ b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot
@@ -39,17 +39,17 @@
                   <label
                     class="leafygreen-ui-1srek1y"
                     data-lgid="lg-label"
-                    for="checkbox-260"
-                    id="checkbox-260-label"
+                    for="checkbox-236"
+                    id="checkbox-236-label"
                   >
                     <input
                       aria-checked="true"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-260-label"
+                      aria-labelledby="checkbox-236-label"
                       checked=""
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-260"
+                      id="checkbox-236"
                       type="checkbox"
                     />
                     <div
diff --git a/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot b/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot
index 0662a5727..9540497ec 100644
--- a/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot
+++ b/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot
@@ -126,8 +126,8 @@
         data-lgid="lg-select"
       >
         <button
-          aria-controls="select-261-menu"
-          aria-describedby="select-261-description"
+          aria-controls="select-237-menu"
+          aria-describedby="select-237-description"
           aria-disabled="false"
           aria-expanded="false"
           aria-invalid="false"
@@ -136,7 +136,7 @@
           data-cy="tasks-table-page-size-selector"
           data-lgid="lg-button"
           data-testid="leafygreen-ui-select-menubutton"
-          id="select-262"
+          id="select-238"
           type="button"
           value="10"
         >
diff --git a/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot b/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot
index 7a507baa3..855a0031b 100644
--- a/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot
+++ b/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot
@@ -13,8 +13,8 @@
           class="leafygreen-ui-6bdaia"
           data-lgid="lg-label"
           data-testid="lg-form_field-label"
-          for="lg-form_field-input-266"
-          id="lg-form_field-label-263"
+          for="lg-form_field-input-242"
+          id="lg-form_field-label-239"
         >
           Some search field
         </label>
@@ -29,10 +29,10 @@
             aria-describedby=""
             aria-disabled="false"
             aria-invalid="false"
-            aria-labelledby="lg-form_field-label-263"
+            aria-labelledby="lg-form_field-label-239"
             autocomplete="on"
             class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
-            id="lg-form_field-input-266"
+            id="lg-form_field-input-242"
             required=""
             type="text"
             value=""
@@ -45,7 +45,7 @@
         class="leafygreen-ui-11ydt2g"
         data-lgid="lg-form_field-feedback"
         data-testid="lg-form_field-feedback"
-        id="lg-form_field-feedback-265"
+        id="lg-form_field-feedback-241"
       />
     </div>
     <div
diff --git a/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot b/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot
index 103871371..202f45670 100644
--- a/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot
+++ b/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot
@@ -13,17 +13,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-267"
-          id="checkbox-267-label"
+          for="checkbox-243"
+          id="checkbox-243-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-267-label"
+            aria-labelledby="checkbox-243-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-267"
+            id="checkbox-243"
             type="checkbox"
           />
           <div
@@ -68,17 +68,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-268"
-          id="checkbox-268-label"
+          for="checkbox-244"
+          id="checkbox-244-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-268-label"
+            aria-labelledby="checkbox-244-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-268"
+            id="checkbox-244"
             type="checkbox"
           />
           <div
@@ -123,17 +123,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-269"
-          id="checkbox-269-label"
+          for="checkbox-245"
+          id="checkbox-245-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-269-label"
+            aria-labelledby="checkbox-245-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-269"
+            id="checkbox-245"
             type="checkbox"
           />
           <div
@@ -178,17 +178,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-270"
-          id="checkbox-270-label"
+          for="checkbox-246"
+          id="checkbox-246-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-270-label"
+            aria-labelledby="checkbox-246-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-270"
+            id="checkbox-246"
             type="checkbox"
           />
           <div
@@ -233,17 +233,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-271"
-          id="checkbox-271-label"
+          for="checkbox-247"
+          id="checkbox-247-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-271-label"
+            aria-labelledby="checkbox-247-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-271"
+            id="checkbox-247"
             type="checkbox"
           />
           <div
@@ -288,17 +288,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-272"
-          id="checkbox-272-label"
+          for="checkbox-248"
+          id="checkbox-248-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-272-label"
+            aria-labelledby="checkbox-248-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-272"
+            id="checkbox-248"
             type="checkbox"
           />
           <div
@@ -343,17 +343,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-273"
-          id="checkbox-273-label"
+          for="checkbox-249"
+          id="checkbox-249-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-273-label"
+            aria-labelledby="checkbox-249-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-273"
+            id="checkbox-249"
             type="checkbox"
           />
           <div
@@ -398,17 +398,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-274"
-          id="checkbox-274-label"
+          for="checkbox-250"
+          id="checkbox-250-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-274-label"
+            aria-labelledby="checkbox-250-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-274"
+            id="checkbox-250"
             type="checkbox"
           />
           <div
@@ -453,17 +453,17 @@
         <label
           class="leafygreen-ui-1srek1y"
           data-lgid="lg-label"
-          for="checkbox-275"
-          id="checkbox-275-label"
+          for="checkbox-251"
+          id="checkbox-251-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-275-label"
+            aria-labelledby="checkbox-251-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-275"
+            id="checkbox-251"
             type="checkbox"
           />
           <div
diff --git a/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot b/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot
index 9eacd419b..7acba899f 100644
--- a/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot
+++ b/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot
@@ -19,8 +19,8 @@
         data-lgid="lg-select"
       >
         <button
-          aria-controls="select-276-menu"
-          aria-describedby="select-276-description"
+          aria-controls="select-252-menu"
+          aria-describedby="select-252-description"
           aria-disabled="false"
           aria-expanded="false"
           aria-invalid="false"
@@ -29,7 +29,7 @@
           data-cy="tuple-select-dropdown"
           data-lgid="lg-button"
           data-testid="leafygreen-ui-select-menubutton"
-          id="select-277"
+          id="select-253"
           type="button"
           value="build_variant"
         >
@@ -113,7 +113,7 @@
             class="leafygreen-ui-11ydt2g"
             data-lgid="lg-form_field-feedback"
             data-testid="lg-form_field-feedback"
-            id="lg-form_field-feedback-280"
+            id="lg-form_field-feedback-256"
           />
         </div>
         <div
diff --git a/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot b/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot
index 944b8b612..64936c6d2 100644
--- a/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot
+++ b/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot
@@ -15,8 +15,8 @@
           class="leafygreen-ui-ozfao7 css-1qa4isu-PaddedSegmentedControl egmqwjk0"
         >
           <div
-            aria-label="segmented-control-282"
-            aria-owns="segmented-control-282-0 segmented-control-282-1"
+            aria-label="segmented-control-258"
+            aria-owns="segmented-control-258-0 segmented-control-258-1"
             class="leafygreen-ui-18en4yf"
             role="tablist"
           >
@@ -33,7 +33,7 @@
                   aria-controls="tuple-select-with-regex"
                   aria-selected="true"
                   class="leafygreen-ui-ypz97o"
-                  id="segmented-control-282-0"
+                  id="segmented-control-258-0"
                   role="tab"
                   tabindex="0"
                   type="button"
@@ -63,7 +63,7 @@
                   aria-controls="tuple-select-with-regex"
                   aria-selected="false"
                   class="leafygreen-ui-ypz97o"
-                  id="segmented-control-282-1"
+                  id="segmented-control-258-1"
                   role="tab"
                   tabindex="-1"
                   type="button"
@@ -98,8 +98,8 @@
         data-lgid="lg-select"
       >
         <button
-          aria-controls="select-283-menu"
-          aria-describedby="select-283-description"
+          aria-controls="select-259-menu"
+          aria-describedby="select-259-description"
           aria-disabled="false"
           aria-expanded="false"
           aria-invalid="false"
@@ -108,7 +108,7 @@
           data-cy="tuple-select-dropdown"
           data-lgid="lg-button"
           data-testid="leafygreen-ui-select-menubutton"
-          id="select-284"
+          id="select-260"
           type="button"
           value="build_variant"
         >
@@ -192,7 +192,7 @@
             class="leafygreen-ui-11ydt2g"
             data-lgid="lg-form_field-feedback"
             data-testid="lg-form_field-feedback"
-            id="lg-form_field-feedback-287"
+            id="lg-form_field-feedback-263"
           />
         </div>
         <div
diff --git a/apps/spruce/src/gql/generated/types.ts b/apps/spruce/src/gql/generated/types.ts
index 4741cead4..aebc6ee2e 100644
--- a/apps/spruce/src/gql/generated/types.ts
+++ b/apps/spruce/src/gql/generated/types.ts
@@ -2777,6 +2777,7 @@ export type TaskEndDetail = {
   __typename?: "TaskEndDetail";
   description?: Maybe<Scalars["String"]["output"]>;
   diskDevices: Array<Scalars["String"]["output"]>;
+  failingCommand?: Maybe<Scalars["String"]["output"]>;
   oomTracker: OomTrackerInfo;
   status: Scalars["String"]["output"];
   timedOut?: Maybe<Scalars["Boolean"]["output"]>;
diff --git a/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot b/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot
index 0c95e164a..757b4b757 100644
--- a/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot
+++ b/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot
@@ -253,7 +253,7 @@
                             >
                               <input
                                 aria-checked="true"
-                                aria-describedby="lg-305"
+                                aria-describedby="lg-281"
                                 aria-disabled="false"
                                 checked=""
                                 class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
@@ -281,7 +281,7 @@
                               for="chart-radio-percent"
                             >
                               <input
-                                aria-describedby="lg-306"
+                                aria-describedby="lg-282"
                                 aria-disabled="false"
                                 class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
                                 data-cy="cy-chart-percent-radio"
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/ParametersContent.tsx b/apps/spruce/src/pages/configurePatch/configurePatchCore/ParametersContent.tsx
index 8ad5ede01..3a1e67c75 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/ParametersContent.tsx
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/ParametersContent.tsx
@@ -39,7 +39,7 @@ export const ParametersContent: React.FC<Props> = ({
       <EditableTagField
         inputTags={patchParameters}
         onChange={setPatchParams}
-        buttonText="Add Parameter"
+        buttonText="Add parameter"
       />
     )}
   </ParamsContainer>
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot b/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot
index 801a23d2f..bc70a5524 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot
@@ -13,8 +13,8 @@
           class="leafygreen-ui-6bdaia"
           data-lgid="lg-label"
           data-testid="lg-form_field-label"
-          for="lg-form_field-input-333"
-          id="lg-form_field-label-330"
+          for="lg-form_field-input-309"
+          id="lg-form_field-label-306"
         >
           Patch Name
         </label>
@@ -29,11 +29,11 @@
             aria-describedby=""
             aria-disabled="false"
             aria-invalid="false"
-            aria-labelledby="lg-form_field-label-330"
+            aria-labelledby="lg-form_field-label-306"
             autocomplete="on"
             class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
             data-cy="patch-name-input"
-            id="lg-form_field-input-333"
+            id="lg-form_field-input-309"
             required=""
             type="text"
             value="test"
@@ -46,7 +46,7 @@
         class="leafygreen-ui-11ydt2g"
         data-lgid="lg-form_field-feedback"
         data-testid="lg-form_field-feedback"
-        id="lg-form_field-feedback-332"
+        id="lg-form_field-feedback-308"
       />
     </div>
     <div
@@ -339,7 +339,7 @@
                             autocomplete="on"
                             class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
                             data-cy="task-filter-input"
-                            id="lg-form_field-input-342"
+                            id="lg-form_field-input-318"
                             placeholder="Search tasks regex"
                             required=""
                             type="text"
@@ -353,7 +353,7 @@
                         class="leafygreen-ui-11ydt2g"
                         data-lgid="lg-form_field-feedback"
                         data-testid="lg-form_field-feedback"
-                        id="lg-form_field-feedback-341"
+                        id="lg-form_field-feedback-317"
                       />
                     </div>
                     <div
@@ -396,17 +396,17 @@
                     <label
                       class="leafygreen-ui-1srek1y"
                       data-lgid="lg-label"
-                      for="checkbox-343"
-                      id="checkbox-343-label"
+                      for="checkbox-319"
+                      id="checkbox-319-label"
                     >
                       <input
                         aria-checked="false"
                         aria-disabled="false"
                         aria-label="checkbox"
-                        aria-labelledby="checkbox-343-label"
+                        aria-labelledby="checkbox-319-label"
                         class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
                         data-cy="select-all-checkbox"
-                        id="checkbox-343"
+                        id="checkbox-319"
                         type="checkbox"
                       />
                       <div
@@ -462,17 +462,17 @@
                     <label
                       class="leafygreen-ui-1srek1y"
                       data-lgid="lg-label"
-                      for="checkbox-344"
-                      id="checkbox-344-label"
+                      for="checkbox-320"
+                      id="checkbox-320-label"
                     >
                       <input
                         aria-checked="false"
                         aria-disabled="false"
                         aria-label="checkbox"
-                        aria-labelledby="checkbox-344-label"
+                        aria-labelledby="checkbox-320-label"
                         class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
                         data-cy="task-checkbox"
-                        id="checkbox-344"
+                        id="checkbox-320"
                         type="checkbox"
                       />
                       <div
@@ -513,17 +513,17 @@
                     <label
                       class="leafygreen-ui-1srek1y"
                       data-lgid="lg-label"
-                      for="checkbox-345"
-                      id="checkbox-345-label"
+                      for="checkbox-321"
+                      id="checkbox-321-label"
                     >
                       <input
                         aria-checked="false"
                         aria-disabled="false"
                         aria-label="checkbox"
-                        aria-labelledby="checkbox-345-label"
+                        aria-labelledby="checkbox-321-label"
                         class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
                         data-cy="task-checkbox"
-                        id="checkbox-345"
+                        id="checkbox-321"
                         type="checkbox"
                       />
                       <div