diff --git a/azure-devops-block-runner/src/main/resources/runner-config.yml b/azure-devops-block-runner/src/main/resources/runner-config.yml
index a79fc1a..4f5c193 100644
--- a/azure-devops-block-runner/src/main/resources/runner-config.yml
+++ b/azure-devops-block-runner/src/main/resources/runner-config.yml
@@ -2,7 +2,7 @@ blockrunner:
   version: ${VERSION:dev}
   uuid: ${RUNNER_UUID:a9786b14-ecfe-44dd-b04c-2bcfd326aa23}
   api:
-    url: ${RUNNER_API_URL:http://localhost:8080}
+    url: ${RUNNER_API_URL:http://localhost:8304}
   auth:
     username: ${RUNNER_API_USERNAME:bb-api}
     password: ${RUNNER_API_PASSWORD:guest}
diff --git a/github-block-runner/src/main/resources/runner-config.yml b/github-block-runner/src/main/resources/runner-config.yml
index cf1d9b3..5b60315 100644
--- a/github-block-runner/src/main/resources/runner-config.yml
+++ b/github-block-runner/src/main/resources/runner-config.yml
@@ -2,7 +2,7 @@ blockrunner:
   version: ${VERSION:dev}
   uuid: ${RUNNER_UUID:606f54c8-ed3b-4a79-ad80-971dfb4eff21}
   api:
-    url: ${RUNNER_API_URL:http://localhost:8080}
+    url: ${RUNNER_API_URL:http://localhost:8302}
   auth:
     username: ${RUNNER_API_USERNAME:bb-api}
     password: ${RUNNER_API_PASSWORD:guest}
diff --git a/gitlab-block-runner/src/main/resources/runner-config.yml b/gitlab-block-runner/src/main/resources/runner-config.yml
index 5aab1f1..8cb2baa 100644
--- a/gitlab-block-runner/src/main/resources/runner-config.yml
+++ b/gitlab-block-runner/src/main/resources/runner-config.yml
@@ -2,7 +2,7 @@ blockrunner:
   version: ${VERSION:dev}
   uuid: ${RUNNER_UUID:bfe76555-7a69-48e8-8cc0-8e02eb76fc22}
   api:
-    url: ${RUNNER_API_URL:http://localhost:8080}
+    url: ${RUNNER_API_URL:http://localhost:8303}
   auth:
     username: ${RUNNER_API_USERNAME:bb-api}
     password: ${RUNNER_API_PASSWORD:guest}
diff --git a/manual-block-runner/src/main/resources/runner-config.yml b/manual-block-runner/src/main/resources/runner-config.yml
index f07277b..6d13eef 100644
--- a/manual-block-runner/src/main/resources/runner-config.yml
+++ b/manual-block-runner/src/main/resources/runner-config.yml
@@ -5,7 +5,7 @@ blockrunner:
   # success and fail. It can be handy for easy local development.
   debugMode: false
   api:
-    url: ${RUNNER_API_URL:http://localhost:8080}
+    url: ${RUNNER_API_URL:http://localhost:8301}
   auth:
     username: ${RUNNER_API_USERNAME:bb-api}
     password: ${RUNNER_API_PASSWORD:guest}
diff --git a/run-controller/runner-config.yml b/run-controller/runner-config.yml
index 757481f..7891229 100644
--- a/run-controller/runner-config.yml
+++ b/run-controller/runner-config.yml
@@ -11,12 +11,13 @@ namespace: default
 # 127.0.0.1 host.minikube.internal
 api:
   url: http://host.minikube.internal:8080
-  # API key auth. Uncomment and set the credentials for this controller, or provide them via the
+  # Option 1: Basic auth credentials (deprecated, prefer API key auth)
+  user: bb-api
+  password: guest
+  # Option 2: API key auth. Uncomment and set the credentials for this controller, or provide them via the
   # RUNNER_API_CLIENT_ID / RUNNER_API_CLIENT_SECRET environment variables (which take precedence).
   # clientId: your-client-id
   # clientSecret: your-client-secret
-  #
-  # Basic auth (username/password) is also still supported but is deprecated; prefer API key auth.
 
 # Unique identifier for this universal run controller.
 # This UUID is used to fetch runs of all implementation types from meshfed-api.
diff --git a/tf-block-runner/runner-config.yml b/tf-block-runner/runner-config.yml
index 0d84a69..1e91fea 100644
--- a/tf-block-runner/runner-config.yml
+++ b/tf-block-runner/runner-config.yml
@@ -5,14 +5,15 @@ initTimeoutMins: 3
 workingDir: /tmp/runner/wd
 tfInstallDir: /tmp/runner/tfbin
 api:
-  url: http://localhost:8080
-  # API key auth. Provide credentials via the RUNNER_API_CLIENT_ID / RUNNER_API_CLIENT_SECRET
-  # environment variables, or uncomment and set them here.
+  url: http://localhost:8300
+  # Option 1: Basic auth (user/password) is also still supported via RUNNER_API_USERNAME / RUNNER_API_PASSWORD but is deprecated;
+  # prefer API key auth.
+  user: bb-api
+  password: guest
+  # Option 2: API key auth (takes precedence over user/password when both clientId and clientSecret are set).
+  # Provide credentials via the RUNNER_API_CLIENT_ID / RUNNER_API_CLIENT_SECRET environment variables, or uncomment and set them here.
   # clientId: your-client-id
   # clientSecret: your-client-secret
-  #
-  # Basic auth (user/password) is also still supported via RUNNER_API_USERNAME /
-  # RUNNER_API_PASSWORD but is deprecated; prefer API key auth.
 insecureHostKeys: false
 privateKey: |
   -----BEGIN PRIVATE KEY-----