diff --git a/web/frontend/src/Tags.root.svelte b/web/frontend/src/Tags.root.svelte
index 03311b4..e1be6a9 100644
--- a/web/frontend/src/Tags.root.svelte
+++ b/web/frontend/src/Tags.root.svelte
@@ -24,15 +24,22 @@
     init,
   } from "./generic/utils.js";
 
-  export let username;
-  export let isAdmin;
-  export let tagmap;
+  /* Svelte 5 Props */
+  let {
+    username,
+    isAdmin,
+    presetTagmap,
+  } = $props();
 
+  /* Const Init */
   const {} = init();
   const client = getContextClient();
 
-  let pendingChange = "none";
+  /* State Init */
+  let pendingChange = $state("none");
+  let tagmap = $state(presetTagmap)
 
+  /* Functions */
   const removeTagMutation = ({ tagIds }) => {
     return mutationStore({
       client: client,
@@ -96,7 +103,7 @@
                 <Button
                   size="sm"
                   color="danger"
-                  on:click={() => removeTag(tag, tagType)}
+                  onclick={() => removeTag(tag, tagType)}
                 >
                   <Icon name="x" />
                 </Button>
diff --git a/web/frontend/src/tags.entrypoint.js b/web/frontend/src/tags.entrypoint.js
index c4f22f5..732a23d 100644
--- a/web/frontend/src/tags.entrypoint.js
+++ b/web/frontend/src/tags.entrypoint.js
@@ -7,7 +7,7 @@ mount(Tags, {
     props: {
         username: username,
         isAdmin: isAdmin,
-        tagmap: tagmap,
+        presetTagmap: tagmap,
     },
     context: new Map([
         ['cc-config', clusterCockpitConfig]