diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-add-open-expanded-1-snap.png b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-add-open-expanded-1-snap.png
index e49d0532..c1a040f0 100644
Binary files a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-add-open-expanded-1-snap.png and b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-add-open-expanded-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-expanded-1-snap.png b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-expanded-1-snap.png
index 56194b1f..db8e9fee 100644
Binary files a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-expanded-1-snap.png and b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-expanded-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-metadata-expanded-1-snap.png b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-metadata-expanded-1-snap.png
index 56194b1f..db8e9fee 100644
Binary files a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-metadata-expanded-1-snap.png and b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/tag-ui-js-tags-metadata-expanded-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/tag.spec.js.snap b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/tag.spec.js.snap
index 3fe86296..f2751cd1 100644
--- a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/tag.spec.js.snap
+++ b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/tag.spec.js.snap
@@ -394,6 +394,42 @@ Array [
             </p>
         </div>
     </div>
+</div>,
+  .c1 {
+  color: rgba(73,73,73,1);
+  font-weight: normal;
+  line-height: 1.625rem;
+  font-size: 1.3125rem;
+  margin: 0;
+}
+
+.c1 + p,
+.c1 + small,
+.c1 + h1,
+.c1 + h2,
+.c1 + label,
+.c1 + h3,
+.c1 + h4,
+.c1 + h5,
+.c1 + div,
+.c1 + span {
+  margin-top: 1.5rem;
+}
+
+.c0 {
+  margin-bottom: 1.5rem;
+}
+
+<div
+    className="c0"
+>
+    <h3
+        className="c1"
+    >
+        0
+         Tag
+        s
+    </h3>
 </div>,
   .c1 {
   margin: 0;
@@ -1900,6 +1936,42 @@ Array [
             </p>
         </div>
     </div>
+</div>,
+  .c1 {
+  color: rgba(73,73,73,1);
+  font-weight: normal;
+  line-height: 1.625rem;
+  font-size: 1.3125rem;
+  margin: 0;
+}
+
+.c1 + p,
+.c1 + small,
+.c1 + h1,
+.c1 + h2,
+.c1 + label,
+.c1 + h3,
+.c1 + h4,
+.c1 + h5,
+.c1 + div,
+.c1 + span {
+  margin-top: 1.5rem;
+}
+
+.c0 {
+  margin-bottom: 1.5rem;
+}
+
+<div
+    className="c0"
+>
+    <h3
+        className="c1"
+    >
+        0
+         Tag
+        s
+    </h3>
 </div>,
   .c1 {
   margin: 0;
@@ -2539,6 +2611,42 @@ Array [
             </p>
         </div>
     </div>
+</div>,
+  .c1 {
+  color: rgba(73,73,73,1);
+  font-weight: normal;
+  line-height: 1.625rem;
+  font-size: 1.3125rem;
+  margin: 0;
+}
+
+.c1 + p,
+.c1 + small,
+.c1 + h1,
+.c1 + h2,
+.c1 + label,
+.c1 + h3,
+.c1 + h4,
+.c1 + h5,
+.c1 + div,
+.c1 + span {
+  margin-top: 1.5rem;
+}
+
+.c0 {
+  margin-bottom: 1.5rem;
+}
+
+<div
+    className="c0"
+>
+    <h3
+        className="c1"
+    >
+        0
+         Tag
+        s
+    </h3>
 </div>,
   .c1 {
   margin: 0;
diff --git a/packages/my-joy-beta/src/containers/create-instance/tags.js b/packages/my-joy-beta/src/containers/create-instance/tags.js
index c3278e5c..37e8d324 100644
--- a/packages/my-joy-beta/src/containers/create-instance/tags.js
+++ b/packages/my-joy-beta/src/containers/create-instance/tags.js
@@ -34,54 +34,48 @@ export const Tags = ({
   handleEdit
 }) => (
   <Fragment>
-    <Title
-      id={step}
-      onClick={!expanded && !proceeded && handleEdit}
-      icon={<TagsIcon />}
-    >
+    <Title id={step} onClick={!expanded && !proceeded && handleEdit} icon={<TagsIcon />}>
       Tags
     </Title>
     {expanded ? (
       <Description>
-        Tags can be used to identify your instances, group multiple instances
-        together, define firewall and affinity rules, and more.{' '}
+        Tags can be used to identify your instances, group multiple instances together, define
+        firewall and affinity rules, and more.{' '}
         <a
           target="__blank"
           href="https://docs.joyent.com/public-cloud/tags-metadata/tags"
-          rel="noopener noreferrer"
-        >
+          rel="noopener noreferrer">
           Read the docs
         </a>
       </Description>
     ) : null}
-    {proceeded ? (
-      <Margin bottom={4}>
-        <H3>
-          {tags.length} Tag{tags.length === 1 ? '' : 's'}
-        </H3>
-      </Margin>
-    ) : null}
     {proceeded || expanded ? (
-      <Margin bottom={4}>
-        <TagList>
-          {tags.map(({ name, value }, index) => (
-            <Tag
-              key={index}
-              name={name}
-              value={value}
-              onRemoveClick={expanded && (() => handleRemoveTag(index))}
-            />
-          ))}
-        </TagList>
-      </Margin>
+      <Fragment>
+        <Margin bottom={4}>
+          <H3>
+            {tags.length} Tag{tags.length === 1 ? '' : 's'}
+          </H3>
+        </Margin>
+        <Margin bottom={4}>
+          <TagList>
+            {tags.map(({ name, value }, index) => (
+              <Tag
+                key={index}
+                name={name}
+                value={value}
+                onRemoveClick={expanded && (() => handleRemoveTag(index))}
+              />
+            ))}
+          </TagList>
+        </Margin>
+      </Fragment>
     ) : null}
     {expanded && addOpen ? (
       <ReduxForm
         form={FORM_NAME_CREATE}
         destroyOnUnmount={false}
         forceUnregisterOnUnmount={true}
-        onSubmit={handleAddTag}
-      >
+        onSubmit={handleAddTag}>
         {props => (
           <KeyValue
             {...props}
@@ -97,11 +91,7 @@ export const Tags = ({
     <div>
       {expanded ? (
         <Margin bottom={4}>
-          <Button
-            type="button"
-            onClick={() => handleChangeAddOpen(true)}
-            secondary
-          >
+          <Button type="button" onClick={() => handleChangeAddOpen(true)} secondary>
             Add Tag
           </Button>
           <Button type="button" onClick={handleNext}>