diff --git a/.github/workflows/publish_image.yml b/.github/workflows/publish_image.yml
index ca4d4811d..009389e07 100644
--- a/.github/workflows/publish_image.yml
+++ b/.github/workflows/publish_image.yml
@@ -1,7 +1,10 @@
 name: Publish docker image
 
 on:
+  workflow_dispatch:
   push:
+    branches:    
+      - 'perf/remove-metadata'
     tags:
       - v*
 
diff --git a/src/mappings/multiTokens/events/attribute_set.ts b/src/mappings/multiTokens/events/attribute_set.ts
index 4ea4dc8f1..be4092269 100644
--- a/src/mappings/multiTokens/events/attribute_set.ts
+++ b/src/mappings/multiTokens/events/attribute_set.ts
@@ -89,13 +89,13 @@ export async function attributeSet(
             if (!token.metadata) {
                 token.metadata = new Metadata()
             }
-            token.metadata = await getMetadata(token.metadata, attribute)
+            // token.metadata = await getMetadata(token.metadata, attribute)
             await ctx.store.save(token)
         } else if (collection) {
             if (!collection.metadata) {
                 collection.metadata = new Metadata()
             }
-            collection.metadata = await getMetadata(collection.metadata, attribute)
+            // collection.metadata = await getMetadata(collection.metadata, attribute)
             await ctx.store.save(collection)
         }
         await ctx.store.save(attribute)
@@ -117,14 +117,14 @@ export async function attributeSet(
             if (!token.metadata) {
                 token.metadata = new Metadata()
             }
-            token.metadata = await getMetadata(token.metadata, attribute)
+            // token.metadata = await getMetadata(token.metadata, attribute)
             token.attributeCount += 1
             await ctx.store.save(token)
         } else if (collection) {
             if (!collection.metadata) {
                 collection.metadata = new Metadata()
             }
-            collection.metadata = await getMetadata(collection.metadata, attribute)
+            // collection.metadata = await getMetadata(collection.metadata, attribute)
             collection.attributeCount += 1
             await ctx.store.save(collection)
         }
diff --git a/src/mappings/multiTokens/events/token_created.ts b/src/mappings/multiTokens/events/token_created.ts
index baf4f65e6..91572b154 100644
--- a/src/mappings/multiTokens/events/token_created.ts
+++ b/src/mappings/multiTokens/events/token_created.ts
@@ -493,7 +493,8 @@ export async function tokenCreated(
         let metadata: Metadata | null | undefined = null
         const collectionUri = collection.attributes.find((e) => e.key === 'uri')
         if (collectionUri && (collectionUri.value.includes('{id}.json') || collectionUri.value.includes('%7Bid%7D.json'))) {
-            metadata = await getMetadata(new Metadata(), collectionUri)
+            // metadata = await getMetadata(new Metadata(), collectionUri)
+            metadata = new Metadata()
             if (metadata) {
                 const collectionWithTokens = await ctx.store.findOneOrFail<Collection>(Collection, {
                     where: { id: eventData.collectionId.toString() },