diff --git a/cli/planoai/core.py b/cli/planoai/core.py
index 174f37c0..54a181d6 100644
--- a/cli/planoai/core.py
+++ b/cli/planoai/core.py
@@ -165,7 +165,7 @@ def _resolve_cli_agent_endpoint(plano_config_yaml: dict) -> tuple[str, int]:
 
     if isinstance(listeners, list):
         for listener in listeners:
-            if listener.get("type") in ["model", "model_listener"]:
+            if listener.get("type") == "model":
                 host = listener.get("host") or listener.get("address") or "0.0.0.0"
                 port = listener.get("port", 12000)
                 return host, port
diff --git a/cli/planoai/utils.py b/cli/planoai/utils.py
index 171006f1..822d6e3c 100644
--- a/cli/planoai/utils.py
+++ b/cli/planoai/utils.py
@@ -89,7 +89,7 @@ def convert_legacy_listeners(
 ) -> tuple[list, dict | None, dict | None]:
     llm_gateway_listener = {
         "name": "egress_traffic",
-        "type": "model_listener",
+        "type": "model",
         "port": 12000,
         "address": "0.0.0.0",
         "timeout": "30s",
@@ -98,7 +98,7 @@ def convert_legacy_listeners(
 
     prompt_gateway_listener = {
         "name": "ingress_traffic",
-        "type": "prompt_listener",
+        "type": "prompt",
         "port": 10000,
         "address": "0.0.0.0",
         "timeout": "30s",
diff --git a/cli/test/test_config_generator.py b/cli/test/test_config_generator.py
index b3e3ab62..dc4c3c44 100644
--- a/cli/test/test_config_generator.py
+++ b/cli/test/test_config_generator.py
@@ -376,7 +376,7 @@ def test_convert_legacy_llm_providers():
     assert updated_providers == [
         {
             "name": "egress_traffic",
-            "type": "model_listener",
+            "type": "model",
             "port": 12000,
             "address": "0.0.0.0",
             "timeout": "30s",
@@ -384,7 +384,7 @@ def test_convert_legacy_llm_providers():
         },
         {
             "name": "ingress_traffic",
-            "type": "prompt_listener",
+            "type": "prompt",
             "port": 10000,
             "address": "0.0.0.0",
             "timeout": "30s",
@@ -400,7 +400,7 @@ def test_convert_legacy_llm_providers():
             },
         ],
         "name": "egress_traffic",
-        "type": "model_listener",
+        "type": "model",
         "port": 12000,
         "timeout": "30s",
     }
@@ -410,7 +410,7 @@ def test_convert_legacy_llm_providers():
         "name": "ingress_traffic",
         "port": 10000,
         "timeout": "30s",
-        "type": "prompt_listener",
+        "type": "prompt",
     }
 
 
@@ -449,7 +449,7 @@ def test_convert_legacy_llm_providers_no_prompt_gateway():
             "name": "egress_traffic",
             "port": 12000,
             "timeout": "30s",
-            "type": "model_listener",
+            "type": "model",
         }
     ]
     assert llm_gateway == {
@@ -461,7 +461,7 @@ def test_convert_legacy_llm_providers_no_prompt_gateway():
             },
         ],
         "name": "egress_traffic",
-        "type": "model_listener",
+        "type": "model",
         "port": 12000,
         "timeout": "30s",
     }