diff --git a/dk-installer.py b/dk-installer.py
index b6e385b..ce14beb 100755
--- a/dk-installer.py
+++ b/dk-installer.py
@@ -51,6 +51,7 @@
 TESTGEN_PULL_TIMEOUT = 5
 TESTGEN_PULL_RETRIES = 3
 TESTGEN_DEFAULT_PORT = 8501
+TESTGEN_DEFAULT_API_PORT = 8530
 TESTGEN_LATEST_VERSIONS_URL = (
     "https://dk-support-external.s3.us-east-1.amazonaws.com/testgen-observability/testgen-latest-versions.json"
 )
@@ -1728,17 +1729,38 @@ def pre_execute(self, action, args):
 
         self.update_base_url = "TG_UI_BASE_URL" not in contents
         if self.update_base_url:
-            port_match = re.search(r"- (\d+):8501", contents)
+            port_match = re.search(rf"- (\d+):{TESTGEN_DEFAULT_PORT}", contents)
             port = port_match.group(1) if port_match else str(TESTGEN_DEFAULT_PORT)
             protocol = "https" if "SSL_CERT_FILE" in contents else "http"
             self._base_url = f"{protocol}://localhost:{port}"
 
-        if not any((self.update_version, self.update_analytics, self.update_token, self.update_base_url)):
+        self.update_api_port = bool(
+            re.search(rf"- \d+:{TESTGEN_DEFAULT_PORT}\b", contents)
+            and not re.search(rf"- \d+:{TESTGEN_DEFAULT_API_PORT}\b", contents)
+        )
+
+        if not any(
+            (
+                self.update_version,
+                self.update_analytics,
+                self.update_token,
+                self.update_base_url,
+                self.update_api_port,
+            )
+        ):
             CONSOLE.msg("No changes will be applied.")
             raise AbortAction
 
     def execute(self, action, args):
-        if not any((self.update_version, self.update_analytics, self.update_token, self.update_base_url)):
+        if not any(
+            (
+                self.update_version,
+                self.update_analytics,
+                self.update_token,
+                self.update_base_url,
+                self.update_api_port,
+            )
+        ):
             raise SkipStep
 
         contents = action.get_compose_file_path(args).read_text()
@@ -1773,6 +1795,11 @@ def execute(self, action, args):
             var = f"\n{match.group(1)}TG_UI_BASE_URL: {self._base_url}"
             contents = contents[0 : match.end()] + var + contents[match.end() :]
 
+        if self.update_api_port:
+            match = re.search(rf"^([ \t]+)- \d+:{TESTGEN_DEFAULT_PORT}\b.*$", contents, flags=re.M)
+            new_mapping = f"\n{match.group(1)}- {TESTGEN_DEFAULT_API_PORT}:{TESTGEN_DEFAULT_API_PORT}"
+            contents = contents[0 : match.end()] + new_mapping + contents[match.end() :]
+
         action.get_compose_file_path(args).write_text(contents)
 
 
@@ -1879,6 +1906,7 @@ def get_compose_file_contents(self, action, args):
                   {ssl_volumes}      
                 ports:
                   - {args.port}:{TESTGEN_DEFAULT_PORT}
+                  - {args.api_port}:{TESTGEN_DEFAULT_API_PORT}
                 extra_hosts:
                   - host.docker.internal:host-gateway
                 depends_on:
@@ -2019,7 +2047,14 @@ def get_parser(self, sub_parsers):
             dest="port",
             action="store",
             default=TESTGEN_DEFAULT_PORT,
-            help="Which port will be used to access Testgen UI. Defaults to %(default)s",
+            help="Which port will be used to access TestGen UI. Defaults to %(default)s",
+        )
+        parser.add_argument(
+            "--api-port",
+            dest="api_port",
+            action="store",
+            default=TESTGEN_DEFAULT_API_PORT,
+            help="Which port will be used to access TestGen's API and MCP server. Defaults to %(default)s",
         )
         parser.add_argument(
             "--image",
diff --git a/tests/conftest.py b/tests/conftest.py
index 0af716e..92484de 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -170,6 +170,7 @@ def args_mock():
     ns.compose_project_name = "test-project"
     ns.compose_file_name = "test-compose.yml"
     ns.port = 8501
+    ns.api_port = 8530
     ns.keep_images = False
     ns.keep_config = False
     ns.skip_verify = False