diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml
index c24536d..476b9e8 100644
--- a/roles/tackle/defaults/main.yml
+++ b/roles/tackle/defaults/main.yml
@@ -226,8 +226,10 @@ rhsso_url: "{{ rhsso_proto }}://keycloak.{{ app_namespace }}.svc:{{ rhsso_port }
 # Kai-related variables
 experimental_deploy_kai: false
 
+kai_component_name: "kai-api"
+kai_service_name: "{{ kai_component_name }}"
+kai_url: "http://{{ kai_service_name }}.{{ app_namespace }}.svc:8080"
 kai_fqin: "{{ lookup('env', 'RELATED_IMAGE_KAI') }}"
-
 kai_api_key_secret_name: kai-api-keys
 kai_jwt_secret_name: kai-jwt-secret
 kai_bam_secret_key: genai_key
diff --git a/roles/tackle/templates/deployment-hub.yml.j2 b/roles/tackle/templates/deployment-hub.yml.j2
index c0c1222..fdcc871 100644
--- a/roles/tackle/templates/deployment-hub.yml.j2
+++ b/roles/tackle/templates/deployment-hub.yml.j2
@@ -192,6 +192,8 @@ spec:
             - name: DISCOVERY_ENABLED
               value: "false"
 {% endif %}
+            - name: KAI_URL
+              value: "{{ kai_url }}"
           ports:
             - containerPort: {{ hub_port }}
               protocol: TCP
diff --git a/roles/tackle/templates/kai/kai-api-service.yaml.j2 b/roles/tackle/templates/kai/kai-api-service.yaml.j2
index 823779b..7eff789 100644
--- a/roles/tackle/templates/kai/kai-api-service.yaml.j2
+++ b/roles/tackle/templates/kai/kai-api-service.yaml.j2
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kai-api
+  name: "{{ kai_service_name }}"
   namespace: "{{ app_namespace }}"
 spec:
   selector: