diff --git a/src/cmdforge/cli/collections_commands.py b/src/cmdforge/cli/collections_commands.py
index 570d6d1..dd1f4bf 100644
--- a/src/cmdforge/cli/collections_commands.py
+++ b/src/cmdforge/cli/collections_commands.py
@@ -731,6 +731,9 @@ def _publish_single_tool(tool_name: str, client) -> dict:
                 config_data = yaml.safe_load(config_path.read_text()) or {}
                 config_data["registry_hash"] = config_hash
                 config_data["registry_status"] = moderation_status
+                registry_owner = result.get("owner")
+                if registry_owner:
+                    config_data["registry_owner"] = registry_owner
                 # Clear any old feedback when republishing
                 if "registry_feedback" in config_data:
                     del config_data["registry_feedback"]
diff --git a/src/cmdforge/cli/registry_commands.py b/src/cmdforge/cli/registry_commands.py
index 8d13e54..499eaa9 100644
--- a/src/cmdforge/cli/registry_commands.py
+++ b/src/cmdforge/cli/registry_commands.py
@@ -600,6 +600,9 @@ def _cmd_registry_publish(args):
                 config_data = yaml.safe_load(config_path.read_text()) or {}
                 config_data["registry_hash"] = config_hash
                 config_data["registry_status"] = moderation_status
+                registry_owner = result.get("owner")
+                if registry_owner:
+                    config_data["registry_owner"] = registry_owner
                 # Clear any old feedback when republishing
                 if "registry_feedback" in config_data:
                     del config_data["registry_feedback"]
diff --git a/src/cmdforge/tool.py b/src/cmdforge/tool.py
index dd4f549..2d199e5 100644
--- a/src/cmdforge/tool.py
+++ b/src/cmdforge/tool.py
@@ -511,13 +511,30 @@ def load_tool(name: str) -> Optional[Tool]:
         return None
 
 
+_REGISTRY_FIELDS = ("registry_hash", "registry_status", "registry_owner", "registry_feedback")
+
+
 def save_tool(tool: Tool) -> Path:
-    """Save a tool to disk."""
+    """Save a tool to disk, preserving registry metadata from existing config."""
     tool_dir = get_tools_dir() / tool.name
     tool_dir.mkdir(parents=True, exist_ok=True)
 
     config_path = tool_dir / "config.yaml"
-    config_path.write_text(yaml.dump(tool.to_dict(), default_flow_style=False, sort_keys=False))
+
+    # Preserve registry fields from existing config (not part of Tool model)
+    preserved = {}
+    if config_path.exists():
+        try:
+            existing = yaml.safe_load(config_path.read_text()) or {}
+            for key in _REGISTRY_FIELDS:
+                if key in existing:
+                    preserved[key] = existing[key]
+        except Exception:
+            pass
+
+    new_data = tool.to_dict()
+    new_data.update(preserved)
+    config_path.write_text(yaml.dump(new_data, default_flow_style=False, sort_keys=False))
 
     # Create wrapper script
     create_wrapper_script(tool.name)