coder
diff --git a/‎site/package.json
+1 b/‎site/package.json
+1
diff --git a/‎site/pnpm-lock.yaml
+71-17 b/‎site/pnpm-lock.yaml
+71-17
diff --git a/‎site/src/pages/HealthPage/Content.tsx
+2-6 b/‎site/src/pages/HealthPage/Content.tsx
+2-6
diff --git a/‎site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
+38-6 b/‎site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
+38-6
diff --git a/‎site/src/pages/TemplateVersionEditorPage/ProvisionerTagsPopover.stories.tsx
+40 b/‎site/src/pages/TemplateVersionEditorPage/ProvisionerTagsPopover.stories.tsx
+40
@@ -106,6 +106,7 @@
     "@storybook/addon-links": "7.5.2",
     "@storybook/addon-mdx-gfm": "7.5.2",
     "@storybook/addon-themes": "7.6.4",
+    "@storybook/preview-api": "7.6.9",
     "@storybook/react": "7.5.2",
     "@storybook/react-vite": "7.5.2",
     "@swc/core": "1.3.38",
 
@@ -170,7 +170,7 @@ export const Pill = forwardRef<HTMLDivElement, PillProps>((props, ref) => {
         border: `1px solid ${theme.palette.divider}`,
         fontSize: 12,
         fontWeight: 500,
-        padding: "8px 16px 8px 8px",
+        padding: 8,
         gap: 8,
         cursor: "default",
       }}
@@ -182,11 +182,7 @@ export const Pill = forwardRef<HTMLDivElement, PillProps>((props, ref) => {
   );
 });
 
-type BooleanPillProps = Omit<
-  ComponentProps<typeof Pill>,
-  "children" | "icon" | "value"
-> & {
-  children: string;
+type BooleanPillProps = Omit<ComponentProps<typeof Pill>, "icon" | "value"> & {
   value: boolean;
 };
 
 
@@ -21,6 +21,9 @@ import Person from "@mui/icons-material/Person";
 import SwapHoriz from "@mui/icons-material/SwapHoriz";
 import Tooltip from "@mui/material/Tooltip";
 import Sell from "@mui/icons-material/Sell";
+import { FC } from "react";
+import CloseIcon from "@mui/icons-material/Close";
+import IconButton from "@mui/material/IconButton";
 
 export const ProvisionerDaemonsPage = () => {
   const healthStatus = useOutletContext<HealthcheckReport>();
@@ -129,9 +132,9 @@ export const ProvisionerDaemonsPage = () => {
                       </span>
                     </Pill>
                   </Tooltip>
-                  {Object.keys(extraTags).map((k) =>
-                    renderTag(k, extraTags[k]),
-                  )}
+                  {Object.keys(extraTags).map((k) => (
+                    <ProvisionerTag key={k} k={k} v={extraTags[k]} />
+                  ))}
                 </div>
               </header>
 
@@ -188,13 +191,42 @@ const parseBool = (s: string): { valid: boolean; value: boolean } => {
   }
 };
 
-const renderTag = (k: string, v: string) => {
+interface ProvisionerTagProps {
+  k: string;
+  v: string;
+  onDelete?: (key: string) => void;
+}
+
+export const ProvisionerTag: FC<ProvisionerTagProps> = ({ k, v, onDelete }) => {
   const { valid, value: boolValue } = parseBool(v);
   const kv = `${k}: ${v}`;
+  const content = onDelete ? (
+    <>
+      {kv}
+      <IconButton
+        aria-label={"delete-" + k}
+        size="small"
+        color="secondary"
+        onClick={() => {
+          onDelete(k);
+        }}
+      >
+        <CloseIcon
+          fontSize="inherit"
+          css={{
+            width: 14,
+            height: 14,
+          }}
+        />
+      </IconButton>
+    </>
+  ) : (
+    kv
+  );
   if (valid) {
-    return <BooleanPill value={boolValue}>{kv}</BooleanPill>;
+    return <BooleanPill value={boolValue}>{content}</BooleanPill>;
   }
-  return <Pill icon={<Sell />}>{kv}</Pill>;
+  return <Pill icon={<Sell />}>{content}</Pill>;
 };
 
 export default ProvisionerDaemonsPage;
@@ -0,0 +1,40 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { chromatic } from "testHelpers/chromatic";
+import { MockTemplateVersion } from "testHelpers/entities";
+import { ProvisionerTagsPopover } from "./ProvisionerTagsPopover";
+import { useArgs } from "@storybook/preview-api";
+
+const meta: Meta<typeof ProvisionerTagsPopover> = {
+  title: "component/ProvisionerTagsPopover",
+  parameters: {
+    chromatic,
+    layout: "centered",
+  },
+  component: ProvisionerTagsPopover,
+  args: {
+    tags: MockTemplateVersion.job.tags,
+  },
+  render: function Render(args) {
+    const [{ tags }, updateArgs] = useArgs();
+
+    return (
+      <ProvisionerTagsPopover
+        {...args}
+        tags={tags}
+        onSubmit={({ key, value }) => {
+          updateArgs({ tags: { ...tags, [key]: value } });
+        }}
+        onDelete={(key) => {
+          const newTags = { ...tags };
+          delete newTags[key];
+          updateArgs({ tags: newTags });
+        }}
+      />
+    );
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof ProvisionerTagsPopover>;
+
+export const Example: Story = {};