diff --git a/core/github_handler.py b/core/github_handler.py
index 9e095e9..d312d72 100644
--- a/core/github_handler.py
+++ b/core/github_handler.py
@@ -15,7 +15,7 @@ def issue_handler(self):
         if not self.entities:
             logger.info("No entities found, looking for left over open issues")
             issue_search_result = Github().search_issue_by_labels(
-                ["Port", self.scorecard.get("title", "")],
+                ["Port", self.scorecard.get("title", ""), settings.blueprint],
                 settings.github_repository,
                 state="open",
             )
diff --git a/generators/github.py b/generators/github.py
index 7b60497..9519b8c 100644
--- a/generators/github.py
+++ b/generators/github.py
@@ -22,7 +22,7 @@ def generate_issue(
             f"\n> :bulb: **Tip:** Scorecards are a way for you and your team to define and track standards, metrics, and KPIs in different categories such as production readiness, quality, productivity, and more. For more information about your scorecards, go to [Port]({get_port_url(settings.port_region)})"
             "\n# Sub-Tasks"
             "\n" + "\n".join(tasks) + "\n",
-            "labels": ["Port", scorecard_title, level, entity["identifier"]],
+            "labels": ["Port", scorecard_title, level, blueprint, entity["identifier"]],
         }
 
     def generate_task(self, rule: dict[str, Any]):