diff --git a/data_collector/data_collector/models.py b/data_collector/data_collector/models.py
index bf153bf..3c7c6ef 100644
--- a/data_collector/data_collector/models.py
+++ b/data_collector/data_collector/models.py
@@ -32,13 +32,16 @@ class Event(peewee.Model):
         }
 
         place_id_by_location = {
-            "Teatro Polytheama": (1, "polytheama"),
-            "Sala Glória Rocha do Centro das Artes": (3, "gloria-rocha"),
+            "Teatro Polytheama": 1,
+            "Sala Glória Rocha do Centro das Artes": 3,
         }
-        place_id, tag = place_id_by_location.get(self.location) or (None, None)
+        place_id = place_id_by_location.get(self.location)
         if place_id:
             payload["place_id"] = place_id
-            payload["tags"] = ["jundiaí", tag]
+
+        tags = self.tags.split(",")
+        if tags:
+            payload["tags"] = tags
 
         with open(f"{settings.IMAGES_STORE}{self.image_path}", "rb") as image_file:
             files = {"image": image_file}
diff --git a/data_collector/data_collector/spiders/cultura_jundiai.py b/data_collector/data_collector/spiders/cultura_jundiai.py
index 4d6f97e..1f4a961 100644
--- a/data_collector/data_collector/spiders/cultura_jundiai.py
+++ b/data_collector/data_collector/spiders/cultura_jundiai.py
@@ -24,15 +24,25 @@ class CulturaJundiaiSpider(scrapy.Spider):
                 end_time = date_search.groupdict()["end_time"]
                 end_datetime = datetime.strptime(f"{date} {end_time}", "%d/%m/%Y %H:%M")
 
+                tags = "jundiaí"
+                location = event.css(".resumo-lista::text").get()
+                tag_by_location = (
+                    {
+                        "Teatro Polytheama": "polytheama",
+                        "Sala Glória Rocha do Centro das Artes": "gloria-rocha",
+                    },
+                )
+                tag = tag_by_location.get(location)
+                if tag:
+                    tags.append(tag)
+
                 event_data = {
                     "title": event.css(".titulo-lista::text").get(),
                     "start_datetime": start_datetime,
                     "end_datetime": end_datetime,
                     "url": event.css("a::attr(href)").get(),
-                    "location": event.css(".resumo-lista::text").get(),
-                    "tags": [
-                        "jundiaí",
-                    ],
+                    "location": location,
+                    "tags": tags,
                 }
                 yield scrapy.Request(
                     event_data["url"],