diff --git a/ai-hub/app/core/orchestration/profiles.py b/ai-hub/app/core/orchestration/profiles.py
index e62bb74..7e698cd 100644
--- a/ai-hub/app/core/orchestration/profiles.py
+++ b/ai-hub/app/core/orchestration/profiles.py
@@ -100,10 +100,6 @@
         name="chat",
         template=DEFAULT_PROMPT_TEMPLATE
     ),
-    "chat": FeatureProfile(
-        name="chat",
-        template=DEFAULT_PROMPT_TEMPLATE
-    ),
     "swarm_control": FeatureProfile(
         name="swarm_control",
         template=DEFAULT_PROMPT_TEMPLATE
diff --git a/ai-hub/app/core/skills/bootstrap.py b/ai-hub/app/core/skills/bootstrap.py
index 0a6e2bd..7112500 100644
--- a/ai-hub/app/core/skills/bootstrap.py
+++ b/ai-hub/app/core/skills/bootstrap.py
@@ -31,7 +31,7 @@
             existing.skill_type = skill_def.get("skill_type")
             existing.config = skill_def.get("config")
             existing.is_enabled = skill_def.get("is_enabled", True)
-            existing.features = skill_def.get("features", ["chat"])
+            existing.features = skill_def.get("features", ["swarm_control"])
             existing.extra_metadata = skill_def.get("extra_metadata", {})
             existing.preview_markdown = skill_def.get("preview_markdown")
             existing.system_prompt = skill_def.get("system_prompt")
@@ -45,7 +45,7 @@
                 skill_type=skill_def.get("skill_type"),
                 config=skill_def.get("config", {}),
                 is_enabled=skill_def.get("is_enabled", True),
-                features=skill_def.get("features", ["chat"]),
+                features=skill_def.get("features", ["swarm_control"]),
                 extra_metadata=skill_def.get("extra_metadata", {}),
                 preview_markdown=skill_def.get("preview_markdown"),
                 is_system=True,
diff --git a/frontend/src/features/skills/components/SkillsPageContent.js b/frontend/src/features/skills/components/SkillsPageContent.js
index be24b0f..3a5f99f 100644
--- a/frontend/src/features/skills/components/SkillsPageContent.js
+++ b/frontend/src/features/skills/components/SkillsPageContent.js
@@ -275,7 +275,7 @@
                                             <div>
                                                 <label className="block text-[10px] font-black uppercase text-gray-400 mb-2 tracking-widest">Capabilities</label>
                                                 <div className="flex flex-wrap gap-2">
-                                                    {['chat', 'voice', 'workflow'].map(f => (
+                                                    {['swarm_control', 'voice_chat', 'workflow'].map(f => (
                                                         <button
                                                             key={f}
                                                             onClick={() => {
diff --git a/frontend/src/features/skills/pages/SkillsPage.js b/frontend/src/features/skills/pages/SkillsPage.js
index e4ef876..5227abb 100644
--- a/frontend/src/features/skills/pages/SkillsPage.js
+++ b/frontend/src/features/skills/pages/SkillsPage.js
@@ -23,7 +23,7 @@
         is_system: false,
         system_prompt: '',
         is_enabled: true,
-        features: ['chat'],
+        features: ['swarm_control'],
         extra_metadata: { emoji: '⚙️' },
         preview_markdown: ''
     });
@@ -81,7 +81,7 @@
                 is_system: skill.is_system,
                 system_prompt: skill.system_prompt || '',
                 is_enabled: skill.is_enabled ?? true,
-                features: skill.features || ['chat'],
+                features: skill.features || ['swarm_control'],
                 extra_metadata: skill.extra_metadata || { emoji: '⚙️' },
                 preview_markdown: skill.preview_markdown || ''
             });
@@ -95,7 +95,7 @@
                 is_system: false,
                 system_prompt: '',
                 is_enabled: true,
-                features: ['chat'],
+                features: ['swarm_control'],
                 extra_metadata: { emoji: '⚙️' },
                 preview_markdown: ''
             });
@@ -113,7 +113,7 @@
             is_system: false,
             system_prompt: skill.system_prompt || '',
             is_enabled: true,
-            features: skill.features || ['chat'],
+            features: skill.features || ['swarm_control'],
             extra_metadata: skill.extra_metadata || { emoji: '⚙️' },
             preview_markdown: skill.preview_markdown || ''
         });
diff --git a/migrate_skill_features.py b/migrate_skill_features.py
new file mode 100644
index 0000000..1c94695
--- /dev/null
+++ b/migrate_skill_features.py
@@ -0,0 +1,56 @@
+import sys; sys.path.append("/app")
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from app.db.models import Skill
+from app.config import settings
+import json
+
+print("Starting skill features migration...")
+try:
+    engine = create_engine(settings.DATABASE_URL)
+    SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+    with SessionLocal() as db:
+        skills = db.query(Skill).all()
+        updated_count = 0
+        for skill in skills:
+            if not skill.features:
+                skill.features = ["swarm_control"]
+                updated_count += 1
+                continue
+            
+            features = list(skill.features)
+            changed = False
+            
+            if "chat" in features:
+                features.remove("chat")
+                changed = True
+            
+            if "voice" in features:
+                features.remove("voice")
+                features.append("voice_chat")
+                changed = True
+                
+            if "swarm" in features:
+                features.remove("swarm")
+                features.append("swarm_control")
+                changed = True
+                
+            if "swarm_control" not in features and len(features) == 0:
+                features.append("swarm_control")
+                changed = True
+            
+            if "swarm_control" not in features and changed:
+                # If they had chat but no swarm_control, we must add swarm_control
+                features.append("swarm_control")
+
+            if changed:
+                # Deduplicate
+                skill.features = list(set(features))
+                updated_count += 1
+
+        db.commit()
+        print(f"Successfully migrated {updated_count} skills legacy feature mappings.")
+
+except Exception as e:
+    print(f"Exception formatting db: {e}")
diff --git a/skills/browser-automation-agent/SKILL.md b/skills/browser-automation-agent/SKILL.md
index 2b8a8c6..e50bdde 100644
--- a/skills/browser-automation-agent/SKILL.md
+++ b/skills/browser-automation-agent/SKILL.md
@@ -8,7 +8,6 @@
 skill_type: system
 is_enabled: true
 features:
-- chat
 - swarm_control
 config:
   service: BrowserService
diff --git a/skills/mesh-file-explorer/SKILL.md b/skills/mesh-file-explorer/SKILL.md
index a79428a..eb8c91c 100644
--- a/skills/mesh-file-explorer/SKILL.md
+++ b/skills/mesh-file-explorer/SKILL.md
@@ -6,7 +6,6 @@
 skill_type: local
 is_enabled: true
 features:
-- chat
 - swarm_control
 config:
   internal_module: app.core.grpc.core.mirror
diff --git a/skills/mesh-inspect-drift/SKILL.md b/skills/mesh-inspect-drift/SKILL.md
index 0ee9f22..c53eeb0 100644
--- a/skills/mesh-inspect-drift/SKILL.md
+++ b/skills/mesh-inspect-drift/SKILL.md
@@ -6,7 +6,6 @@
 skill_type: local
 is_enabled: true
 features:
-- chat
 - swarm_control
 config:
   parameters:
diff --git a/skills/mesh-sync-control/SKILL.md b/skills/mesh-sync-control/SKILL.md
index 7481c3e..a484caa 100644
--- a/skills/mesh-sync-control/SKILL.md
+++ b/skills/mesh-sync-control/SKILL.md
@@ -6,7 +6,6 @@
 skill_type: local
 is_enabled: true
 features:
-- chat
 - swarm_control
 config:
   actions:
diff --git a/skills/mesh-terminal-control/SKILL.md b/skills/mesh-terminal-control/SKILL.md
index aa637d8..ed0db6e 100644
--- a/skills/mesh-terminal-control/SKILL.md
+++ b/skills/mesh-terminal-control/SKILL.md
@@ -6,7 +6,6 @@
 skill_type: remote_grpc
 is_enabled: true
 features:
-- chat
 - swarm_control
 config:
   service: TerminalService
diff --git a/skills/mesh-wait-tasks/SKILL.md b/skills/mesh-wait-tasks/SKILL.md
index e1f2345..7c84604 100644
--- a/skills/mesh-wait-tasks/SKILL.md
+++ b/skills/mesh-wait-tasks/SKILL.md
@@ -5,7 +5,6 @@
 skill_type: remote_grpc
 is_enabled: true
 features:
-- chat
 - swarm_control
 config:
   parameters: