diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py
index ac910162b2..08d9f59acf 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -513,7 +513,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
                 if workflow is None:
                     raise ValueError("Workflow not found")
 
-                # FIXME: Consolidate runtime config checking into a unified location.
+                # FIXME:(sandbox) Consolidate runtime config checking into a unified location.
                 runtime = workflow.features_dict.get("runtime")
                 graph_engine_layers: tuple = ()
                 if isinstance(runtime, dict) and runtime.get("enabled"):
diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py
index fb0a75ff62..a6fe9694a4 100644
--- a/api/core/app/apps/workflow/app_generator.py
+++ b/api/core/app/apps/workflow/app_generator.py
@@ -488,7 +488,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
                 if workflow is None:
                     raise ValueError("Workflow not found")
 
-                # FIXME: Consolidate runtime config checking into a unified location.
+                # FIXME:(sandbox) Consolidate runtime config checking into a unified location.
                 runtime = workflow.features_dict.get("runtime")
                 if isinstance(runtime, dict) and runtime.get("enabled"):
                     graph_engine_layers = (
diff --git a/api/core/virtual_environment/sandbox_manager.py b/api/core/virtual_environment/sandbox_manager.py
index 8443208632..3a0666f5e5 100644
--- a/api/core/virtual_environment/sandbox_manager.py
+++ b/api/core/virtual_environment/sandbox_manager.py
@@ -17,7 +17,7 @@ class SandboxManager:
     contention in hot paths like `get()`.
     """
 
-    # FIXME: Prefer a workflow-level context on GraphRuntimeState to store workflow-scoped shared objects.
+    # FIXME:(sandbox) Prefer a workflow-level context on GraphRuntimeState to store workflow-scoped shared objects.
 
     _NUM_SHARDS: Final[int] = 1024
     _SHARD_MASK: Final[int] = _NUM_SHARDS - 1